projects/linux·commit 752a4787

Revert "char: moxa, prevent opening unavailable ports"

752a4787 · Linus Torvalds <[email protected]> · 2009-06-22 11:24:43 -07:00

This reverts commit a90b037583d5f1ae3e54e9c687c79df82d1d34a4, which
already got fixed as commit f0e8527726b9e56649b9eafde3bc0fbc4dd2dd47:
the same patch (trivial differences) got applied twice.

Requested-by: Alan Cox <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
752a4787511bf7515f99609ff4ae52341b5bfcde
Parents
f234012f

Changes

1 files changed · +1 −6

FileStatusAddDelContent
drivers/char/moxa.cmodified+1−6View file

drivers/char/moxa.c

View file
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;
}