From 78ea619e6dcc978585c9d068ceb97f73af8343eb Mon Sep 17 00:00:00 2001
From: Jason Wang <jason77.wang@gmail.com>
Date: Sat, 21 Aug 2010 15:14:42 +0800
Subject: [PATCH] --- yaml --- r: 213495 b: refs/heads/master c:
 891b9dd10764352926e1e107756aa229dfa2c210 h: refs/heads/master i:   213493:
 db53de8d71e6e95aefa1c736589bba98cd4bca86   213491:
 a49ddc948e65de411c2bd1b17f92451225019ca1   213487:
 53325ed4693f780cc68c0ee3b20b4272698b2b80 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/serial/serial_core.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0edc53ceca1..070dc24c1d12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca2e71aa8cfb0056ce720f3fd53f59f5fac4a3e1
+refs/heads/master: 891b9dd10764352926e1e107756aa229dfa2c210
diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c
index ff21200f94f4..bc6cddd10294 100644
--- a/trunk/drivers/serial/serial_core.c
+++ b/trunk/drivers/serial/serial_core.c
@@ -2066,6 +2066,18 @@ 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)) {
+		/*
+		 * First try to use the console cflag setting.
+		 */
+		memset(&termios, 0, sizeof(struct ktermios));
+		termios.c_cflag = uport->cons->cflag;
+
+		/*
+		 * If that's unset, use the tty termios setting.
+		 */
+		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);