diff options
| author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 01:16:24 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 01:16:24 -0700 |
| commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
| tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /drivers/serial/amba-pl010.c | |
| parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
| download | op-kernel-dev-b19312c4c8f3f84da57bba01d45549df1cf10dcd.zip op-kernel-dev-b19312c4c8f3f84da57bba01d45549df1cf10dcd.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.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 f2a5e29..2884b31 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); } |
