---

yaml --- r: 325737 b: refs/heads/master c: a6b19c3 h: refs/heads/master i: 325735: 6829f24 v: v3
git-mirror · Sep 6, 2012 · 5f370de · 5f370de
1 parent b447cd3
commit 5f370de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9727faf4706eb49ce88e3f2bb961278a84eac080
+refs/heads/master: a6b19c333c2f100f32e07d5209cf9f0b4f81b6eb
diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/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;
 }