From 477e85f88dbbcf7cf006efacaa0dbb72c979ea53 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 30 Nov 2009 13:16:57 +0000
Subject: [PATCH] --- yaml --- r: 175345 b: refs/heads/master c:
 a9a37ec33a1b3e66b260ac1c29bff0aec8b89ae4 h: refs/heads/master i:   175343:
 8f53eb30f2b25aac13f6cbc7e4b227b8dad12c3f v: v3

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

diff --git a/[refs] b/[refs]
index 9b939df33803..7ea5a370dc83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d74e8286885ac9f3ccc5e2dc2301f21bbec90f7b
+refs/heads/master: a9a37ec33a1b3e66b260ac1c29bff0aec8b89ae4
diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c
index 43a190738fee..84006de2900f 100644
--- a/trunk/drivers/char/tty_port.c
+++ b/trunk/drivers/char/tty_port.c
@@ -409,6 +409,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
 	mutex_lock(&port->mutex);
 
 	if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
+		clear_bit(TTY_IO_ERROR, &tty->flags);
 		if (port->ops->activate) {
 			int retval = port->ops->activate(port, tty);
 			if (retval) {
@@ -417,7 +418,6 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
 			}
 		}
 		set_bit(ASYNCB_INITIALIZED, &port->flags);
-		clear_bit(TTY_IO_ERROR, &tty->flags);
 	}
 	mutex_unlock(&port->mutex);
 	return tty_port_block_til_ready(port, tty, filp);