diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 11:24:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 11:24:43 -0700 |
| commit | 752a4787511bf7515f99609ff4ae52341b5bfcde (patch) | |
| tree | e3eec5f08fd4502022fd53e8354340fa50cb512b /drivers/char | |
| parent | f234012f52a37e48f2330e1ca2df69800e797c3b (diff) | |
| download | op-kernel-dev-752a4787511bf7515f99609ff4ae52341b5bfcde.zip op-kernel-dev-752a4787511bf7515f99609ff4ae52341b5bfcde.tar.gz | |
Revert "char: moxa, prevent opening unavailable ports"
This reverts commit a90b037583d5f1ae3e54e9c687c79df82d1d34a4, which
already got fixed as commit f0e8527726b9e56649b9eafde3bc0fbc4dd2dd47:
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/moxa.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 6799588..65b6ff2 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -1189,11 +1189,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) return -ENODEV; } - if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) { - retval = -ENODEV; - goto out_unlock; - } - ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; ch->port.count++; tty->driver_data = ch; @@ -1218,8 +1213,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) moxa_close_port(tty); } else ch->port.flags |= ASYNC_NORMAL_ACTIVE; -out_unlock: mutex_unlock(&moxa_openlock); + return retval; } |
