From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 5 Mar 2012 13:51:54 +0000 (+0100)
Subject: TTY: remove tty driver re-set from tty_reopen
X-Git-Tag: MMI-PSA29.97-13-9~17267^2~85
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ecd166507f4218c9988d005feb04b7215f9df321;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

TTY: remove tty driver re-set from tty_reopen

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>
---

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index d0d3d1f94926..dd8a938510ca 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -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));