summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-04-12 10:32:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-12 23:08:17 +0200
commit78c6cccadb6ead2dab503f95aefdbfb2ae409a32 (patch)
tree120e59e1f5d261043a198e63a126a546877ad3fc
parentserial: 8250_dw: Fix the stub for dw8250_probe_acpi() (diff)
downloadlinux-78c6cccadb6ead2dab503f95aefdbfb2ae409a32.tar.xz
linux-78c6cccadb6ead2dab503f95aefdbfb2ae409a32.zip
TTY: synclink: fix DTR being raised on hang up
Make sure to check ASYNC_INITIALISED before raising DTR when waking up from blocked open in 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>
-rw-r--r--drivers/tty/synclink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 72d607101f90..8eaf1ab8addb 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -3308,7 +3308,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
port->blocked_open++;
while (1) {
- if (tty->termios.c_cflag & CBAUD)
+ if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags))
tty_port_raise_dtr_rts(port);
set_current_state(TASK_INTERRUPTIBLE);