mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
tty fix for 3.13-rc3
Here is a single n_tty fix for 3.13-rc3 that resolves a regression in 3.12 that has been reported. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEABECAAYFAlKiFdwACgkQMUfUDdst+yn9mwCgzPY2TXNpr35x2TzdsrbpRQBJ dcAAn2Ou/sVNbROaafILhu7n0gHToZI4 =LXUl -----END PGP SIGNATURE----- Merge tag 'tty-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty fix from Greg KH: "Here is a single n_tty fix for 3.13-rc3 that resolves a regression in 3.12 that has been reported" * tag 'tty-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: n_tty: Fix missing newline echo
This commit is contained in:
commit
3f02ff5c2c
1 changed files with 4 additions and 2 deletions
|
@ -810,7 +810,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);
|
||||
|
@ -825,7 +826,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);
|
||||
|
|
Loading…
Reference in a new issue