diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 00:06:06 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 00:06:06 +0200 |
| commit | aef7b83c92dd0b7e994805440655d1d64147287b (patch) | |
| tree | 981f373358c1988e061625e8f272013065cb086f /drivers/serial/serial_lh7a40x.c | |
| parent | [netdrvr] Fix register_netdev() races in older ISA net drivers (diff) | |
| parent | Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz linux-aef7b83c92dd0b7e994805440655d1d64147287b.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/serial/serial_lh7a40x.c')
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 85cfa08d3bad..56f269b6bfb1 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c @@ -190,18 +190,7 @@ lh7a40xuart_rx_chars (struct uart_port* port) if (uart_handle_sysrq_char (port, (unsigned char) data, regs)) continue; - if ((data & port->ignore_status_mask) == 0) { - tty_insert_flip_char(tty, data, flag); - } - if ((data & RxOverrunError) - && 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, data, RxOverrunError, data, flag); } tty_flip_buffer_push (tty); return; |