diff options
Diffstat (limited to 'drivers/char/n_tty.c')
| -rw-r--r-- | drivers/char/n_tty.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 4bf35716b..1c6f93f44 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c @@ -922,8 +922,14 @@ do_it_again: } } - if (down_interruptible(&tty->atomic_read)) - return -ERESTARTSYS; + if (file->f_flags & O_NONBLOCK) { + if (down_trylock(&tty->atomic_read)) + return -EAGAIN; + } + else { + if (down_interruptible(&tty->atomic_read)) + return -ERESTARTSYS; + } add_wait_queue(&tty->read_wait, &wait); set_bit(TTY_DONT_FLIP, &tty->flags); |