diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-07 15:55:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 16:27:53 -0700 |
| commit | e584a02cf517537a3d13c7f85ced45fd07ab85cd (patch) | |
| tree | 2c1e6f1696212b28e95e0ef78298510670f9e6db /drivers/tty/tty_port.c | |
| parent | 31ca020b57f7c08da187613cf20becd664c467fa (diff) | |
| download | blackbird-op-linux-e584a02cf517537a3d13c7f85ced45fd07ab85cd.tar.gz blackbird-op-linux-e584a02cf517537a3d13c7f85ced45fd07ab85cd.zip | |
TTY: fix DTR being raised on hang up
Make sure to check ASYNC_INITIALISED before raising DTR when waking up
from blocked open in tty_port_block_til_ready.
Currently DTR could get raised at hang up as a blocked process would
raise DTR unconditionally before checking for hang up and returning.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_port.c')
| -rw-r--r-- | drivers/tty/tty_port.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index 73bc1d989d32..7e3eaf4eb9fe 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c @@ -388,7 +388,7 @@ int tty_port_block_til_ready(struct tty_port *port, while (1) { /* Indicate we are open */ - if (tty->termios.c_cflag & CBAUD) + if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags)) tty_port_raise_dtr_rts(port); prepare_to_wait(&port->open_wait, &wait, TASK_INTERRUPTIBLE); |
