From fc76cf16e45e5b37c2cb9b2d4e023676032638d4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 22 Jun 2009 11:24:43 -0700 Subject: [PATCH] Revert "char: moxa, prevent opening unavailable ports" This reverts commit e78db1c8f1fc003c6e2ab01d85e4360a553b8f45, which already got fixed as commit c9ea754115762f8b33d2f76e3570b0765c595ba5: the same patch (trivial differences) got applied twice. Requested-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/char/moxa.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 6799588b00997..65b6ff2442c6d 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; } -- 2.39.5