---

yaml --- r: 267340 b: refs/heads/master c: 94abc56 h: refs/heads/master v: v3
git-mirror · Sep 22, 2011 · 90a05e0 · 90a05e0
1 parent 41d8580
commit 90a05e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 153d3d9be7ce6d87a83e4871ec94ddf6b9604814
+refs/heads/master: 94abc56f4d90f289ea32a0a11d3577fcd8cb28fb
diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c
@@ -1975,6 +1975,8 @@ 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);
 
+		if (console_suspend_enabled)
+			uart_change_pm(state, 0);
 		uport->ops->set_termios(uport, &termios, NULL);
 		if (console_suspend_enabled)
 			console_start(uport->cons);