Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f02ff5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2d4d4a8d 39434abd

drivers/tty/n_tty.c

+4 −2
Original line number Diff line number Diff line
@@ -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);