aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShachar Shemesh <shachar@liveu.tv>2012-07-10 00:54:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-12 17:54:14 -0400
commit40c9f61eae9098212b6906f29f30f08f7a19b5e2 (patch)
treeace42166f5546e2cd882813085567ffb27812909 /drivers
parenteb26dfe8aa7eeb5a5aa0b7574550125f8aa4c3b3 (diff)
tty ldisc: Close/Reopen race prevention should check the proper flag
Commit acfa747b introduced the TTY_HUPPING flag to distinguish closed TTY from currently closing ones. The test in tty_set_ldisc still remained pointing at the old flag. This causes pppd to sometimes lapse into uninterruptible sleep when killed and restarted. Signed-off-by: Shachar Shemesh <shachar@liveu.tv> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/tty_ldisc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index ba8be396a621..847f7ed7a3ed 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
659 goto enable; 659 goto enable;
660 } 660 }
661 661
662 if (test_bit(TTY_HUPPED, &tty->flags)) { 662 if (test_bit(TTY_HUPPING, &tty->flags)) {
663 /* We were raced by the hangup method. It will have stomped 663 /* We were raced by the hangup method. It will have stomped
664 the ldisc data and closed the ldisc down */ 664 the ldisc data and closed the ldisc down */
665 clear_bit(TTY_LDISC_CHANGING, &tty->flags); 665 clear_bit(TTY_LDISC_CHANGING, &tty->flags);