From a9978ea69b66fc81c298b0e08723b8cca50d507e Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 4 Feb 2008 22:27:51 -0800 Subject: [PATCH] --- yaml --- r: 83003 b: refs/heads/master c: 9d778a69370cc1b643b13648df971c83ff5654ef h: refs/heads/master i: 83001: b60a77b63f8e5242c7b96a42d789718539f7380a 82999: dee91a545f45df2951c9de3ff8cbc40c339076ec v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7dee3d7947bb..fe224c64eb51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74a197417240120d638d67d74f48655fb7f46f16 +refs/heads/master: 9d778a69370cc1b643b13648df971c83ff5654ef diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index 0cf382b55d4b..2554d2fa6542 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/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) {