diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-04-12 04:32:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-12 17:08:18 -0400 |
commit | e1c969f7814dcd23bbfe8d777544321a492b6fee (patch) | |
tree | 212c9e69e2a7d39446180711e0e10ed0b112a1a3 /net/irda/ircomm/ircomm_tty.c | |
parent | 53a72d57515b2c94af616bceab79751f894eca56 (diff) |
TTY: ircomm: fix DTR being raised on hang up
Make sure to check ASYNC_INITIALISED before raising DTR when waking up
from blocked open in ircomm_tty_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>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda/ircomm/ircomm_tty.c')
-rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 362ba47968e4..41ac7938268b 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c | |||
@@ -328,7 +328,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, | |||
328 | spin_unlock_irqrestore(&port->lock, flags); | 328 | spin_unlock_irqrestore(&port->lock, flags); |
329 | 329 | ||
330 | while (1) { | 330 | while (1) { |
331 | if (tty->termios.c_cflag & CBAUD) | 331 | if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags)) |
332 | tty_port_raise_dtr_rts(port); | 332 | tty_port_raise_dtr_rts(port); |
333 | 333 | ||
334 | set_current_state(TASK_INTERRUPTIBLE); | 334 | set_current_state(TASK_INTERRUPTIBLE); |