---

yaml --- r: 325607 b: refs/heads/master c: 40c9f61 h: refs/heads/master i: 325605: 3dd7adc 325603: 5f7c0a6 325599: ed92331 v: v3
git-mirror · Jul 12, 2012 · 6a58891 · 6a58891
1 parent 2b6445b
commit 6a58891
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb26dfe8aa7eeb5a5aa0b7574550125f8aa4c3b3
+refs/heads/master: 40c9f61eae9098212b6906f29f30f08f7a19b5e2
diff --git a/trunk/drivers/tty/tty_ldisc.c b/trunk/drivers/tty/tty_ldisc.c
@@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 		goto enable;
 	}
 
-	if (test_bit(TTY_HUPPED, &tty->flags)) {
+	if (test_bit(TTY_HUPPING, &tty->flags)) {
 		/* We were raced by the hangup method. It will have stomped
 		   the ldisc data and closed the ldisc down */
 		clear_bit(TTY_LDISC_CHANGING, &tty->flags);