diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 05:44:13 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-30 05:44:13 +0400 |
| commit | 4ceedcf8151c1b91ad45a2603d4473c0ad3ac03c (patch) | |
| tree | 3282387ff7ac6fd108a119417bd1f93c018fed1a /drivers/tty/n_tty.c | |
| parent | 058555739166561b97313123521574f0a9b2c9d7 (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | linux-4ceedcf8151c1b91ad45a2603d4473c0ad3ac03c.tar.xz | |
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>
Diffstat (limited to 'drivers/tty/n_tty.c')
| -rw-r--r-- | drivers/tty/n_tty.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 2ba7bf86d096..09505ff4fb25 100644 --- 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; } |