From: Jiri Slaby Date: Wed, 20 Apr 2011 08:43:16 +0000 (+0200) Subject: TTY: serial_core, remove invalid test X-Git-Tag: upstream/snapshot3+hdmi~10347^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32ad3a77b256948a326c3f68db6acaad2b6953e7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git TTY: serial_core, remove invalid test tty->index (named here as line) is set up in initialize_tty_struct. The value is checked in get_tty_driver for the found driver as: if (device < base || device >= base + p->num) continue; *index = device - base; So index/line can never be more than driver->num. Hence remove this test from uart_open. Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 55965d5..69d0000 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1530,15 +1530,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp) pr_debug("uart_open(%d) called\n", line); /* - * tty->driver->num won't change, so we won't fail here with - * tty->driver_data set to something non-NULL (and therefore - * we won't get caught by uart_close()). - */ - retval = -ENODEV; - if (line >= tty->driver->num) - goto fail; - - /* * We take the semaphore inside uart_get to guarantee that we won't * be re-entered while allocating the state structure, or while we * request any IRQs that the driver may need. This also has the nice