summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+lkml@arm.linux.org.uk>2008-02-04 22:27:51 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 09:44:09 -0800
commit9d778a69370cc1b643b13648df971c83ff5654ef (patch)
treee32a231699733217a8ab2f42893c6e5b5cf97a97 /drivers
parent74a197417240120d638d67d74f48655fb7f46f16 (diff)
downloadlinux-3.10-9d778a69370cc1b643b13648df971c83ff5654ef.tar.gz
linux-3.10-9d778a69370cc1b643b13648df971c83ff5654ef.tar.bz2
linux-3.10-9d778a69370cc1b643b13648df971c83ff5654ef.zip
serial: avoid waking up closed serial ports on resume
When we boot, serial ports remain in low power mode until they're used either by userspace or for the kernel console. However, if you suspend the system, and then resume, all serial ports will be taken out of low power mode. This is bad news for embedded devices where this can mean higher power consumption. Only bring a serial port out of low power mode if the port is being used as the kernel console, or is in use by userspace. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0cf382b55d4..2554d2fa654 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2029,8 +2029,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
}
port->suspended = 0;
- uart_change_pm(state, 0);
-
/*
* Re-enable the console device after suspending.
*/
@@ -2049,6 +2047,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
if (state->info && state->info->tty && termios.c_cflag == 0)
termios = *state->info->tty->termios;
+ uart_change_pm(state, 0);
port->ops->set_termios(port, &termios, NULL);
console_start(port->cons);
}
@@ -2057,6 +2056,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
const struct uart_ops *ops = port->ops;
int ret;
+ uart_change_pm(state, 0);
ops->set_mctrl(port, 0);
ret = ops->startup(port);
if (ret == 0) {