1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 460a72d91bb..20563c509b2 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/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) {