]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
tty: Don't change receive_room for ioctl(TIOCSETD)
authorPeter Hurley <peter@hurleysoftware.com>
Sat, 15 Jun 2013 13:14:13 +0000 (09:14 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Jul 2013 23:42:59 +0000 (16:42 -0700)
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>
drivers/tty/tty_ldisc.c

index 75fa99978348db2465cb35bace4e38429f4feaa8..e52d615735538b53c785fe8153a83d5bfd56a18c 100644 (file)
@@ -540,9 +540,6 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
                return 0;
        }
 
-       /* FIXME: why 'shutoff' input if the ldisc is locked? */
-       tty->receive_room = 0;
-
        old_ldisc = tty->ldisc;
        tty_lock(tty);