summaryrefslogtreecommitdiffstats
path: root/drivers/serial/nwpserial.c
diff options
context:
space:
mode:
authorBenjamin Krill <ben@codiert.org>2009-05-13 05:56:54 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-15 16:43:42 +1000
commit951c4df5b7703137bf4eee002d98d083fbc890cc (patch)
treecd60e96d0a6e1deeba177894b8cfaa8ba51c0345 /drivers/serial/nwpserial.c
parent37cd8ed90fc5b11941110d2d0cea6807f86d4787 (diff)
serial/nwpserial: Fix wrong register read address and add interrupt acknowledge.
The receive interrupt routine checks the wrong register if the receive fifo is empty. Further an explicit interrupt acknowledge write is introduced. In some circumstances another interrupt was issued. Signed-off-by: Benjamin Krill <ben@codiert.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/serial/nwpserial.c')
-rw-r--r--drivers/serial/nwpserial.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index 32f3eaf0d26..9e150b19d72 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -145,11 +145,13 @@ static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
ch = dcr_read(up->dcr_host, UART_RX);
if (up->port.ignore_status_mask != NWPSERIAL_STATUS_RXVALID)
tty_insert_flip_char(tty, ch, TTY_NORMAL);
- } while (dcr_read(up->dcr_host, UART_RX) & UART_LSR_DR);
+ } while (dcr_read(up->dcr_host, UART_LSR) & UART_LSR_DR);
tty_flip_buffer_push(tty);
ret = IRQ_HANDLED;
+ /* clear interrupt */
+ dcr_write(up->dcr_host, UART_IIR, 1);
out:
spin_unlock(&up->port.lock);
return ret;