TTY: serial_core, remove invalid test
authorJiri Slaby <jslaby@suse.cz>
Wed, 20 Apr 2011 08:43:16 +0000 (10:43 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 21:19:11 +0000 (14:19 -0700)
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 <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/tty/serial/serial_core.c

index 55965d5..69d0000 100644 (file)
@@ -1529,15 +1529,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
        BUG_ON(!tty_locked());
        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