aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tty_port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 43a190738fee..84006de2900f 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
@@ -409,6 +409,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
409 mutex_lock(&port->mutex); 409 mutex_lock(&port->mutex);
410 410
411 if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) { 411 if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
412 clear_bit(TTY_IO_ERROR, &tty->flags);
412 if (port->ops->activate) { 413 if (port->ops->activate) {
413 int retval = port->ops->activate(port, tty); 414 int retval = port->ops->activate(port, tty);
414 if (retval) { 415 if (retval) {
@@ -417,7 +418,6 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
417 } 418 }
418 } 419 }
419 set_bit(ASYNCB_INITIALIZED, &port->flags); 420 set_bit(ASYNCB_INITIALIZED, &port->flags);
420 clear_bit(TTY_IO_ERROR, &tty->flags);
421 } 421 }
422 mutex_unlock(&port->mutex); 422 mutex_unlock(&port->mutex);
423 return tty_port_block_til_ready(port, tty, filp); 423 return tty_port_block_til_ready(port, tty, filp);