TTY: ircomm: fix DTR being raised on hang up
authorJohan Hovold <jhovold@gmail.com>
Fri, 12 Apr 2013 08:32:31 +0000 (10:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Apr 2013 21:08:18 +0000 (14:08 -0700)
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>
net/irda/ircomm/ircomm_tty.c

index 362ba47968e41de822122f9c215e012ba566cd59..41ac7938268be6ca07401bf0e9596c9e604444be 100644 (file)
@@ -328,7 +328,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
        spin_unlock_irqrestore(&port->lock, flags);
 
        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);