summaryrefslogtreecommitdiff
path: root/drivers/tty/n_tty.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-06-15 17:14:29 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-24 03:43:02 +0400
commitf95499c3030fe1bfad57745f2db1959c5b43dca8 (patch)
tree0cb875c59a1fe4f13107660bc576c6e801335a5e /drivers/tty/n_tty.c
parentd1913e3916f35eb043e8d770839dd96c1379007d (diff)
downloadlinux-f95499c3030fe1bfad57745f2db1959c5b43dca8.tar.xz
n_tty: Don't wait for buffer work in read() loop
User-space read() can run concurrently with receiving from device; waiting for receive_buf() to complete is not required. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/n_tty.c')
-rw-r--r--drivers/tty/n_tty.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index fe1c39992c51..a6eea30d0911 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1724,7 +1724,6 @@ static inline int input_available_p(struct tty_struct *tty, int amt)
{
struct n_tty_data *ldata = tty->disc_data;
- tty_flush_to_ldisc(tty);
if (ldata->icanon && !L_EXTPROC(tty)) {
if (ldata->canon_head != ldata->read_tail)
return 1;