diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-11-18 14:12:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-08 10:22:18 -0800 |
| commit | d9abf6e4f67279f0ea926e6beef7baa9661dce75 (patch) | |
| tree | 1f305d48aa359cc05d55bd2623cadfc3d7f278ab | |
| parent | 77d12b19a0fe01d9e81baae809903ec329f84a15 (diff) | |
tty_port: handle the nonblocking open of a dead port corner case
commit 8627b96dd80dca440d91fbb1ec733be25912d0dd upstream.
Some drivers allow O_NDELAY of a dead port (eg for setserial to work). In that
situation we must not try to raise the carrier.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/char/tty_port.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c index 6db51f37e2c8..c0ff7eeafbb2 100644 --- a/drivers/char/tty_port.c +++ b/drivers/char/tty_port.c @@ -217,8 +217,11 @@ int tty_port_block_til_ready(struct tty_port *port, /* if non-blocking mode is set we can pass directly to open unless the port has just hung up or is in another error state */ - if ((filp->f_flags & O_NONBLOCK) || - (tty->flags & (1 << TTY_IO_ERROR))) { + if (tty->flags & (1 << TTY_IO_ERROR)) { + port->flags |= ASYNC_NORMAL_ACTIVE; + return 0; + } + if (filp->f_flags & O_NONBLOCK) { /* Indicate we are open */ if (tty->termios->c_cflag & CBAUD) tty_port_raise_dtr_rts(port); |