diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-07-09 09:21:14 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-05 16:28:35 -0700 |
| commit | fca04198d5b8e48a535df52ada1b6b384474cacc (patch) | |
| tree | 75254f9c4fd15130c0b4497ab8b490a7696c6ce0 | |
| parent | 0ec5ac16b3d5b70cd0b34249addea6fb104e4305 (diff) | |
| download | linux-3.10-fca04198d5b8e48a535df52ada1b6b384474cacc.tar.gz linux-3.10-fca04198d5b8e48a535df52ada1b6b384474cacc.tar.bz2 linux-3.10-fca04198d5b8e48a535df52ada1b6b384474cacc.zip | |
serial: core: Preserve termios c_cflag for console resume
commit ae84db9661cafc63d179e1d985a2c5b841ff0ac4 upstream.
When a tty is opened for the serial console, the termios c_cflag
settings are inherited from the console line settings.
However, if the tty is subsequently closed, the termios settings
are lost. This results in a garbled console if the console is later
suspended and resumed.
Preserve the termios c_cflag for the serial console when the tty
is shutdown; this reflects the most recent line settings.
Fixes: Bugzilla #69751, 'serial console does not wake from S3'
Reported-by: Valerio Vanni <valerio.vanni@inwind.it>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index f87dbfd3277..0f1cc2c8c22 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -241,6 +241,9 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) /* * Turn off DTR and RTS early. */ + if (uart_console(uport) && tty) + uport->cons->cflag = tty->termios.c_cflag; + if (!tty || (tty->termios.c_cflag & HUPCL)) uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS); |