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/serial_lh7a40x.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/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 85cfa08d3ba..56f269b6bfb 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; |