---

yaml --- r: 325780 b: refs/heads/master c: 9a12fcf h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · 01d15e1 · 01d15e1
1 parent 73b0ac1
commit 01d15e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65ecc9c02dbad033a73a32916d17c107c5b25031
+refs/heads/master: 9a12fcf8b1543c99ffcec3d61db86f0dea52dc9d
diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c
@@ -334,6 +334,10 @@ static unsigned int check_modem_status(struct uart_omap_port *up)
 static void serial_omap_rlsi(struct uart_omap_port *up, unsigned int lsr)
 {
 	unsigned int flag;
+	unsigned char ch = 0;
+
+	if (likely(lsr & UART_LSR_DR))
+		ch = serial_in(up, UART_RX);
 
 	up->port.icount.rx++;
 	flag = TTY_NORMAL;