diff options
| author | Sridhar Vashist <svashist@motorola.com> | 2014-08-28 11:48:00 -0500 |
|---|---|---|
| committer | Sridhar Vashist <svashist@motorola.com> | 2014-08-28 17:22:14 -0500 |
| commit | 769befe79e68c6833fc8cfcb22c31b40847e7194 (patch) | |
| tree | 19a3c93916460e062fe78bfb3069a18345df2ea8 | |
| parent | 71c0f1a08b1b65e92f984b226d2791c3c3190a29 (diff) | |
| download | olio-linux-3.10-769befe79e68c6833fc8cfcb22c31b40847e7194.tar.xz olio-linux-3.10-769befe79e68c6833fc8cfcb22c31b40847e7194.zip | |
IKXCLOCK-3681 omap: uart: fix RTS pulldown corner case for aborted suspend
Change-Id: I7cf8531cbdc4e5ed03e56c5e14c73adaf6ef34f3
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index e637567b40b..7d041f28cf2 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1372,6 +1372,10 @@ static int serial_omap_prepare(struct device *dev) 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 @@ static int serial_omap_resume(struct device *dev) 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; } |