summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2012-09-06 15:45:36 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-06 09:17:02 -0700
commita6b19c333c2f100f32e07d5209cf9f0b4f81b6eb (patch)
tree0b37879e1146499c176571b53e4addd094e0ecce /drivers/tty
parent9727faf4706eb49ce88e3f2bb961278a84eac080 (diff)
serial: omap: make sure to put() on poll_get_char
if we would reach serial_omap_get_char() while Data Ready bit isn't set, we would return from it without kicking our pm timer. This would mean we would, eventually, have an unbalanced pm_runtime_get on our device which would prevent it from ever sleeping again. Tested-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/omap-serial.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7531147fbd38..6a58f4f64f81 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1005,12 +1005,17 @@ static int serial_omap_poll_get_char(struct uart_port *port)
pm_runtime_get_sync(up->dev);
status = serial_in(up, UART_LSR);
- if (!(status & UART_LSR_DR))
- return NO_POLL_CHAR;
+ if (!(status & UART_LSR_DR)) {
+ status = NO_POLL_CHAR;
+ goto out;
+ }
status = serial_in(up, UART_RX);
+
+out:
pm_runtime_mark_last_busy(up->dev);
pm_runtime_put_autosuspend(up->dev);
+
return status;
}