projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f234012
)
Revert "char: moxa, prevent opening unavailable ports"
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 22 Jun 2009 18:24:43 +0000
(11:24 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 22 Jun 2009 18:24:43 +0000
(11:24 -0700)
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>
drivers/char/moxa.c
patch
|
blob
|
history
diff --git
a/drivers/char/moxa.c
b/drivers/char/moxa.c
index 6799588b009976ca5d0efd98a065fd60f21d902d..65b6ff2442c6df4edfd839b37752ded8340df9c9 100644
(file)
--- 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;
}