TTY: remove tty driver re-set from tty_reopen
authorJiri Slaby <jslaby@suse.cz>
Mon, 5 Mar 2012 13:51:54 +0000 (14:51 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Mar 2012 19:38:50 +0000 (11:38 -0800)
This is from tty_reopen:
    struct tty_driver *driver = tty->driver;
    ...
    tty->driver = driver;
and it doesn't make sense at all. The driver is intended to be set in
initialize_tty_struct from tty_init_dev (initial open). So this set in
tty_reopen is not needed.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/tty_io.c

index d0d3d1f94926596524fc5b640b6b1bd8d2efb54b..dd8a938510caa147719200e9aea43fff14426d93 100644 (file)
@@ -1348,7 +1348,6 @@ static int tty_reopen(struct tty_struct *tty)
                tty->link->count++;
        }
        tty->count++;
-       tty->driver = driver; /* N.B. why do this every time?? */
 
        mutex_lock(&tty->ldisc_mutex);
        WARN_ON(!test_bit(TTY_LDISC, &tty->flags));