From 411bf6e8a7e990aa1adfbfbdba581881cc944f33 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Sat, 21 Aug 2010 15:14:41 +0800 Subject: [PATCH] --- yaml --- r: 213494 b: refs/heads/master c: ca2e71aa8cfb0056ce720f3fd53f59f5fac4a3e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 080c86100abf..b0edc53ceca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d838016af3b15452043256acad0be63f215115ba +refs/heads/master: ca2e71aa8cfb0056ce720f3fd53f59f5fac4a3e1 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index cd8511298bcb..ff21200f94f4 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -2065,7 +2065,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) /* * Re-enable the console device after suspending. */ - if (uart_console(uport)) { + if (console_suspend_enabled && uart_console(uport)) { uart_change_pm(state, 0); uport->ops->set_termios(uport, &termios, NULL); console_start(uport->cons);