summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-04-12 10:32:30 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-12 14:08:18 -0700
commit53a72d57515b2c94af616bceab79751f894eca56 (patch)
treec0d30022b4e6f56ab2769b253d854738e9981f3f
parent5d8be15a621d739c376572607bab1ac0449947a4 (diff)
downloadlinux-3.10-53a72d57515b2c94af616bceab79751f894eca56.tar.gz
linux-3.10-53a72d57515b2c94af616bceab79751f894eca56.tar.bz2
linux-3.10-53a72d57515b2c94af616bceab79751f894eca56.zip
TTY: synclinkmp: 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/synclinkmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 6d5780cf1d5..ff171384ea5 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -3329,7 +3329,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);