From 6a588912e029359ed3dabbf6969fd80342288327 Mon Sep 17 00:00:00 2001
From: Shachar Shemesh <shachar@liveu.tv>
Date: Tue, 10 Jul 2012 07:54:13 +0300
Subject: [PATCH] --- yaml --- r: 325607 b: refs/heads/master c:
 40c9f61eae9098212b6906f29f30f08f7a19b5e2 h: refs/heads/master i:   325605:
 3dd7adc1dd8e8f0d21dc465e581f0b5908c893d9   325603:
 5f7c0a66693a059ddaef721a705134b067abbe85   325599:
 ed92331c3fb46d5be1d00ab5a52c1daa31957146 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/tty/tty_ldisc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d2be1a180183..7c65b59ad13b 100644
--- 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
index ba8be396a621..847f7ed7a3ed 100644
--- 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);