lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "char: moxa, prevent opening unavailable ports"

Browse Source 
This reverts commit a90b037583, which
already got fixed as commit f0e8527726:
the same patch (trivial differences) got applied twice.

Requested-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds
2009-06-22 11:24:43 -07:00
parent f234012f52
commit 752a478751
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/moxa.c
View File

@@ -1189,11 +1189,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
return -ENODEV; return -ENODEV;
} }
if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) {
retval = -ENODEV;
goto out_unlock;
}
ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
ch->port.count++; ch->port.count++;
tty->driver_data = ch; tty->driver_data = ch;
@@ -1218,8 +1213,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
moxa_close_port(tty); moxa_close_port(tty);
} else } else
ch->port.flags |= ASYNC_NORMAL_ACTIVE; ch->port.flags |= ASYNC_NORMAL_ACTIVE;
out_unlock:
mutex_unlock(&moxa_openlock); mutex_unlock(&moxa_openlock);
return retval; return retval;
} }