From aac28064208fb8b99cf14f06fb1b1c3d4a8d75d4 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 25 Nov 2010 00:27:54 +0100
Subject: [PATCH] --- yaml --- r: 222824 b: refs/heads/master c:
 7f90cfc505d613f4faf096e0d84ffe99208057d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9c37f5acf462..70ac7951d058 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a80c49dbb6cd389fd5b0d79f850b56322475d00b
+refs/heads/master: 7f90cfc505d613f4faf096e0d84ffe99208057d9
diff --git a/trunk/drivers/tty/tty_ldisc.c b/trunk/drivers/tty/tty_ldisc.c
index d8e96b005023..4214d58276f7 100644
--- a/trunk/drivers/tty/tty_ldisc.c
+++ b/trunk/drivers/tty/tty_ldisc.c
@@ -454,6 +454,8 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)
                 /* BTM here locks versus a hangup event */
 		WARN_ON(!tty_locked());
 		ret = ld->ops->open(tty);
+		if (ret)
+			clear_bit(TTY_LDISC_OPEN, &tty->flags);
 		return ret;
 	}
 	return 0;