---

yaml --- r: 175345 b: refs/heads/master c: a9a37ec h: refs/heads/master i: 175343: 8f53eb3 v: v3
git-mirror · Dec 11, 2009 · 477e85f · 477e85f
1 parent 12b6684
commit 477e85f
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: d74e8286885ac9f3ccc5e2dc2301f21bbec90f7b
+refs/heads/master: a9a37ec33a1b3e66b260ac1c29bff0aec8b89ae4
diff --git 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);