From 01d15e12d645cd78e8e317732c8e06dd6e2ddd1e Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Fri, 21 Sep 2012 20:07:19 +0530 Subject: [PATCH] --- yaml --- r: 325780 b: refs/heads/master c: 9a12fcf8b1543c99ffcec3d61db86f0dea52dc9d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ec629867d1c9..4b9c2be5a549 100644 --- 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 index 3c05c5ecdfbf..ccc2f35adff1 100644 --- 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;