From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Sep 2013 01:44:13 +0000 (-0700)
Subject: Merge 3.12-rc3 into tty-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4ceedcf8151c1b91ad45a2603d4473c0ad3ac03c;p=deliverable%2Flinux.git

Merge 3.12-rc3 into tty-next

We want the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

4ceedcf8151c1b91ad45a2603d4473c0ad3ac03c
diff --cc drivers/tty/n_tty.c
index 2ba7bf86d096,01bf5eb4f238..09505ff4fb25
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@@ -1752,11 -1752,13 +1752,10 @@@ int is_ignored(int sig
  static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
  {
  	struct n_tty_data *ldata = tty->disc_data;
 -	int canon_change = 1;
  
 -	if (old)
 -		canon_change = (old->c_lflag ^ tty->termios.c_lflag) & ICANON;
 -	if (canon_change) {
 +	if (!old || (old->c_lflag ^ tty->termios.c_lflag) & ICANON) {
  		bitmap_zero(ldata->read_flags, N_TTY_BUF_SIZE);
- 		ldata->line_start = 0;
- 		ldata->canon_head = ldata->read_tail;
+ 		ldata->line_start = ldata->canon_head = ldata->read_tail;
  		ldata->erasing = 0;
  		ldata->lnext = 0;
  	}