diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
| commit | 69887ac1dcb79dfc773dabac2dd081fa6d6e2573 (patch) | |
| tree | 23a4f685c71ff8666548b0a01b221928e46a9287 /drivers/serial/amba-pl011.c | |
| parent | 5e014b10ef8477c32a939a48fa02aedcad35a226 (diff) | |
| parent | 118326e940bdecef6c459d42ccf05256ba86daa7 (diff) | |
| download | talos-obmc-linux-69887ac1dcb79dfc773dabac2dd081fa6d6e2573.tar.gz talos-obmc-linux-69887ac1dcb79dfc773dabac2dd081fa6d6e2573.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/serial/amba-pl011.c')
| -rw-r--r-- | drivers/serial/amba-pl011.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index d5cbef3fe8b6..7db88ee18f75 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -163,18 +163,8 @@ pl011_rx_chars(struct uart_amba_port *uap) if (uart_handle_sysrq_char(&uap->port, ch, regs)) goto ignore_char; - if ((rsr & uap->port.ignore_status_mask) == 0) { - tty_insert_flip_char(tty, ch, flag); - } - if ((rsr & UART01x_RSR_OE) && - tty->flip.count < TTY_FLIPBUF_SIZE) { - /* - * Overrun is special, since it's reported - * immediately, and doesn't affect the current - * character - */ - tty_insert_flip_char(tty, 0, TTY_OVERRUN); - } + uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag); + ignore_char: status = readw(uap->port.membase + UART01x_FR); } |
