diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2013-06-15 09:14:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 19:42:59 -0400 |
commit | 3b80df7ca7e2fec76be2eda304cc7e0eb90f911d (patch) | |
tree | c3f50fa148d5cd9e77f66d0f02666396bcd51178 /drivers/tty/tty_ldisc.c | |
parent | b0e95858238d95f32edf00ff4a0375165129d0c6 (diff) |
tty: Don't change receive_room for ioctl(TIOCSETD)
tty_set_ldisc() is guaranteed exclusive use of the line discipline
by tty_ldisc_lock_pair_timeout(); shutting off input by resetting
receive_room is unnecessary.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
-rw-r--r-- | drivers/tty/tty_ldisc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 75fa99978348..e52d61573553 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c | |||
@@ -540,9 +540,6 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc) | |||
540 | return 0; | 540 | return 0; |
541 | } | 541 | } |
542 | 542 | ||
543 | /* FIXME: why 'shutoff' input if the ldisc is locked? */ | ||
544 | tty->receive_room = 0; | ||
545 | |||
546 | old_ldisc = tty->ldisc; | 543 | old_ldisc = tty->ldisc; |
547 | tty_lock(tty); | 544 | tty_lock(tty); |
548 | 545 | ||