Merge 3.12-rc3 into tty-next

[mirror_ubuntu-zesty-kernel.git] / drivers / tty / n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 2ba7bf86d0968cbfffa8dd6b7a7d556355d9e009..09505ff4fb25b362d38155addce7d601313be591 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1755,8 +1755,7 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
 
        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;
        }