diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-16 10:34:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-16 10:34:52 -0700 |
| commit | 768cbfbc5273bad91afe12b81471f563b288118a (patch) | |
| tree | 954b95e1d1af6c21df7c85f265d218e48908e161 /drivers/serial/amba-pl010.c | |
| parent | 2a4a7e02e27b4f542473772d588f81759c209fb3 (diff) | |
| parent | 05ab3014636ff60a319d37cdf37dca594b015eec (diff) | |
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index f2a5e2933c4..2884b310e54 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -198,18 +198,8 @@ pl010_rx_chars(struct uart_port *port) if (uart_handle_sysrq_char(port, ch, regs)) goto ignore_char; - if ((rsr & 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(port, rsr, UART01x_RSR_OE, ch, flag); + ignore_char: status = UART_GET_FR(port); } |