summaryrefslogtreecommitdiffstats
path: root/drivers/tty/n_tty.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-17 01:36:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-17 01:36:37 +0100
commit6a8c62f3e97fdf184fde60bc99155476e8e9cd55 (patch)
tree71b818d584f79baf1a192df65c758a592a63360d /drivers/tty/n_tty.c
parentinit.h: add missing initcall variants (diff)
parentLinux 3.13-rc4 (diff)
downloadlinux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.tar.xz
linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.zip
Merge 3.13-rc4 into tty-next
We want the fixes in here as well.
Diffstat (limited to 'drivers/tty/n_tty.c')
-rw-r--r--drivers/tty/n_tty.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index c7f8f7bc1423..fdc2ecde5ac2 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -812,7 +812,8 @@ static void process_echoes(struct tty_struct *tty)
struct n_tty_data *ldata = tty->disc_data;
size_t echoed;
- if (!L_ECHO(tty) || ldata->echo_commit == ldata->echo_tail)
+ if ((!L_ECHO(tty) && !L_ECHONL(tty)) ||
+ ldata->echo_commit == ldata->echo_tail)
return;
mutex_lock(&ldata->output_lock);
@@ -827,7 +828,8 @@ static void flush_echoes(struct tty_struct *tty)
{
struct n_tty_data *ldata = tty->disc_data;
- if (!L_ECHO(tty) || ldata->echo_commit == ldata->echo_head)
+ if ((!L_ECHO(tty) && !L_ECHONL(tty)) ||
+ ldata->echo_commit == ldata->echo_head)
return;
mutex_lock(&ldata->output_lock);