kgdb,8250,pl011: Return immediately from console poll

[deliverable/linux.git] / drivers / serial / amba-pl011.c

diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 743ebf5f16da8942bc6c7d23508cc69cfd9eb229..eb4cb480b93e9be344f9f84bbd574c68fe3ec8e6 100644 (file)
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -342,9 +342,9 @@ static int pl010_get_poll_char(struct uart_port *port)
        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int status;
 
-       do {
-               status = readw(uap->port.membase + UART01x_FR);
-       } while (status & UART01x_FR_RXFE);
+       status = readw(uap->port.membase + UART01x_FR);
+       if (status & UART01x_FR_RXFE)
+               return NO_POLL_CHAR;
 
        return readw(uap->port.membase + UART01x_DR);
 }