diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-03-05 06:09:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-06 02:47:05 -0500 |
| commit | f74861ca87264e594e0134e8ac14db06be77fe6f (patch) | |
| tree | 1892fd9ca51aa7984f5f6146811b22da4b1610ae /net/irda | |
| parent | 0b176ce3a7cbfa92eceddf3896f1a504877d974a (diff) | |
| download | linux-stable-f74861ca87264e594e0134e8ac14db06be77fe6f.tar.gz linux-stable-f74861ca87264e594e0134e8ac14db06be77fe6f.tar.bz2 linux-stable-f74861ca87264e594e0134e8ac14db06be77fe6f.zip | |
net/irda: Raise dtr in non-blocking open
DTR/RTS need to be raised, regardless of the open() mode, but not
if the port has already shutdown.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 522543d9264a..362ba47968e4 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -289,8 +289,15 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, * If non-blocking mode is set, or the port is not enabled, * then make the check up front and then exit. */ - if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){ - /* nonblock mode is set or port is not enabled */ + if (test_bit(TTY_IO_ERROR, &tty->flags)) { + port->flags |= ASYNC_NORMAL_ACTIVE; + return 0; + } + + if (filp->f_flags & O_NONBLOCK) { + /* nonblock mode is set */ + if (tty->termios.c_cflag & CBAUD) + tty_port_raise_dtr_rts(port); port->flags |= ASYNC_NORMAL_ACTIVE; IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __func__ ); return 0; |