Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / drivers / serial / serial_core.c

diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 7abe532..17839e7 100644 (file)
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1968,16 +1968,16 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                struct termios termios;
 
                /*
-                * Get the termios for this line
+                * First try to use the console cflag setting.
                 */
-               tty_get_termios(drv->tty_driver, port->line, &termios);
+               memset(&termios, 0, sizeof(struct termios));
+               termios.c_cflag = port->cons->cflag;
 
                /*
-                * If the console cflag is still set, subsitute that
-                * for the termios cflag.
+                * If that's unset, use the tty termios setting.
                 */
-               if (port->cons->cflag)
-                       termios.c_cflag = port->cons->cflag;
+               if (state->info && state->info->tty && termios.c_cflag == 0)
+                       termios = *state->info->tty->termios;
 
                port->ops->set_termios(port, &termios, NULL);
                console_start(port->cons);