diff options
-rw-r--r-- | drivers/serial/serial_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index 0cf382b55d4b..2554d2fa6542 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) | |||
2029 | } | 2029 | } |
2030 | port->suspended = 0; | 2030 | port->suspended = 0; |
2031 | 2031 | ||
2032 | uart_change_pm(state, 0); | ||
2033 | |||
2034 | /* | 2032 | /* |
2035 | * Re-enable the console device after suspending. | 2033 | * Re-enable the console device after suspending. |
2036 | */ | 2034 | */ |
@@ -2049,6 +2047,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) | |||
2049 | if (state->info && state->info->tty && termios.c_cflag == 0) | 2047 | if (state->info && state->info->tty && termios.c_cflag == 0) |
2050 | termios = *state->info->tty->termios; | 2048 | termios = *state->info->tty->termios; |
2051 | 2049 | ||
2050 | uart_change_pm(state, 0); | ||
2052 | port->ops->set_termios(port, &termios, NULL); | 2051 | port->ops->set_termios(port, &termios, NULL); |
2053 | console_start(port->cons); | 2052 | console_start(port->cons); |
2054 | } | 2053 | } |
@@ -2057,6 +2056,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) | |||
2057 | const struct uart_ops *ops = port->ops; | 2056 | const struct uart_ops *ops = port->ops; |
2058 | int ret; | 2057 | int ret; |
2059 | 2058 | ||
2059 | uart_change_pm(state, 0); | ||
2060 | ops->set_mctrl(port, 0); | 2060 | ops->set_mctrl(port, 0); |
2061 | ret = ops->startup(port); | 2061 | ret = ops->startup(port); |
2062 | if (ret == 0) { | 2062 | if (ret == 0) { |