diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 14:24:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 14:24:43 -0400 |
commit | 752a4787511bf7515f99609ff4ae52341b5bfcde (patch) | |
tree | e3eec5f08fd4502022fd53e8354340fa50cb512b | |
parent | f234012f52a37e48f2330e1ca2df69800e797c3b (diff) |
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>
-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 6799588b0099..65b6ff2442c6 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) | |||
1189 | return -ENODEV; | 1189 | return -ENODEV; |
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | if (port % MAX_PORTS_PER_BOARD >= brd->numPorts) { | ||
1193 | retval = -ENODEV; | ||
1194 | goto out_unlock; | ||
1195 | } | ||
1196 | |||
1197 | ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; | 1192 | ch = &brd->ports[port % MAX_PORTS_PER_BOARD]; |
1198 | ch->port.count++; | 1193 | ch->port.count++; |
1199 | tty->driver_data = ch; | 1194 | tty->driver_data = ch; |
@@ -1218,8 +1213,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp) | |||
1218 | moxa_close_port(tty); | 1213 | moxa_close_port(tty); |
1219 | } else | 1214 | } else |
1220 | ch->port.flags |= ASYNC_NORMAL_ACTIVE; | 1215 | ch->port.flags |= ASYNC_NORMAL_ACTIVE; |
1221 | out_unlock: | ||
1222 | mutex_unlock(&moxa_openlock); | 1216 | mutex_unlock(&moxa_openlock); |
1217 | |||
1223 | return retval; | 1218 | return retval; |
1224 | } | 1219 | } |
1225 | 1220 | ||