aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gernoth <michael@gernoth.net>2016-11-09 01:31:20 +0100
committerAndreas Blaesius <skate4life@gmx.de>2017-03-17 11:03:11 +0100
commitfb0eb00e657692c2ac3d5c05f063ae35c2c8543d (patch)
tree93521ad3440ad32d4147c9dc374ec9bc0f9a65e3
parentf6b319646d369ce7091246bc0a0296665a86e001 (diff)
downloadkernel_samsung_espresso10-fb0eb00e657692c2ac3d5c05f063ae35c2c8543d.zip
kernel_samsung_espresso10-fb0eb00e657692c2ac3d5c05f063ae35c2c8543d.tar.gz
kernel_samsung_espresso10-fb0eb00e657692c2ac3d5c05f063ae35c2c8543d.tar.bz2
Revert "BACKPORT: tty: Prevent ldisc drivers from re-using stale tty fields"
This is not compatible with the TTY-layer in 3.0 which expects to be able to use these fields as they are valid in the TTY-layer in this version. This reverts commit 6e325381fcd82b9795bd0b5db71b67672d048fbc. Change-Id: I148806274b7ffea29746865e5d53b4b8b698f6c7
-rw-r--r--drivers/tty/tty_ldisc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 606c0956..a76c808 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -424,10 +424,6 @@ EXPORT_SYMBOL_GPL(tty_ldisc_flush);
* they are not on hot paths so a little discipline won't do
* any harm.
*
- * The line discipline-related tty_struct fields are reset to
- * prevent the ldisc driver from re-using stale information for
- * the new ldisc instance.
- *
* Locking: takes termios_mutex
*/
@@ -436,9 +432,6 @@ static void tty_set_termios_ldisc(struct tty_struct *tty, int num)
mutex_lock(&tty->termios_mutex);
tty->termios->c_line = num;
mutex_unlock(&tty->termios_mutex);
-
- tty->disc_data = NULL;
- tty->receive_room = 0;
}
/**