From 9bdc4d6764c478891c8190033a41bf26f0467b68 Mon Sep 17 00:00:00 2001 From: Yin Kangkai Date: Sun, 30 Jan 2011 11:15:30 +0800 Subject: [PATCH] --- yaml --- r: 235511 b: refs/heads/master c: 5933a161abcb8d83a2c145177f48027c3c0a8995 h: refs/heads/master i: 235509: d75570e1436a8215fe18c73d87f1e0ebe67000cd 235507: 9f5662ce29550847967ca81b608e396630cb93cd 235503: eed74006ae1ca4a3f26ce85adbf878d8421630c1 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d9dc3667ae5..1e562c994b09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8653d305ef66861c91fa7455fb8038460a7274c +refs/heads/master: 5933a161abcb8d83a2c145177f48027c3c0a8995 diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 460a72d91bb7..20563c509b21 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -2064,7 +2064,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) /* * Re-enable the console device after suspending. */ - if (console_suspend_enabled && uart_console(uport)) { + if (uart_console(uport)) { /* * First try to use the console cflag setting. */ @@ -2077,9 +2077,9 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) if (port->tty && port->tty->termios && termios.c_cflag == 0) termios = *(port->tty->termios); - uart_change_pm(state, 0); uport->ops->set_termios(uport, &termios, NULL); - console_start(uport->cons); + if (console_suspend_enabled) + console_start(uport->cons); } if (port->flags & ASYNC_SUSPENDED) {