---

yaml
---
r: 235511
b: refs/heads/master
c: 5933a16
h: refs/heads/master
i:
  235509: d75570e
  235507: 9f5662c
  235503: eed7400
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8653d305ef66861c91fa7455fb8038460a7274c
+refs/heads/master: 5933a161abcb8d83a2c145177f48027c3c0a8995

trunk/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) {