commit 769befe79e68c6833fc8cfcb22c31b40847e7194
author Sridhar Vashist <svashist@motorola.com> Thu Aug 28 11:48:00 2014 -0500
committer Sridhar Vashist <svashist@motorola.com> Thu Aug 28 17:22:14 2014 -0500
tree 19a3c93916460e062fe78bfb3069a18345df2ea8
parent 71c0f1a08b1b65e92f984b226d2791c3c3190a29

IKXCLOCK-3681 omap: uart: fix RTS pulldown corner case for aborted suspend

Change-Id: I7cf8531cbdc4e5ed03e56c5e14c73adaf6ef34f3
Signed-off-by: Sridhar Vashist <svashist@motorola.com>

drivers/tty/serial/omap-serial.c

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index e637567..7d041f2 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1372,6 +1372,10 @@
 static void serial_omap_complete(struct device *dev)
 {
 	struct uart_omap_port *up = dev_get_drvdata(dev);
+	if (up->need_delayed_rts && up->pin_default && up->pin_idle) {
+		pinctrl_select_state(up->pins, up->pin_default);
+		up->need_delayed_rts = 0;
+	}
 
 	up->is_suspending = false;
 }
@@ -1390,10 +1394,6 @@
 	struct uart_omap_port *up = dev_get_drvdata(dev);
 
 	uart_resume_port(&serial_omap_reg, &up->port);
-	if (up->need_delayed_rts && up->pin_default && up->pin_idle) {
-		pinctrl_select_state(up->pins, up->pin_default);
-		up->need_delayed_rts = 0;
-	}
 
 	return 0;
 }