aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial/vr41xx_siu.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-05-17 09:10:20 -0700
committerTony Luck <tony.luck@intel.com>2005-05-17 09:10:20 -0700
commitd0dac8082cbc2b234917ec53eb591b1ddbec80bb (patch)
tree105651af2db033de4803b91cc029381a1b9b39d2 /drivers/serial/vr41xx_siu.c
parentbfd68594082d8384781c242aa72a7950b5cf51aa (diff)
parentff96b3d4b840e8aa126e0a60fd743417ffdee178 (diff)
Merge with linus
Diffstat (limited to 'drivers/serial/vr41xx_siu.c')
-rw-r--r--drivers/serial/vr41xx_siu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 307886199f2..5d2ceb623e6 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -412,10 +412,8 @@ static inline void receive_chars(struct uart_port *port, uint8_t *status,
if (uart_handle_sysrq_char(port, ch, regs))
goto ignore_char;
- if ((lsr & port->ignore_status_mask) == 0)
- tty_insert_flip_char(tty, ch, flag);
- if ((lsr & UART_LSR_OE) && (tty->flip.count < TTY_FLIPBUF_SIZE))
- tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+
+ uart_insert_char(port, lsr, UART_LSR_OE, ch, flag);
ignore_char:
lsr = siu_read(port, UART_LSR);