diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /drivers/serial/clps711x.c | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/serial/clps711x.c')
| -rw-r--r-- | drivers/serial/clps711x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 6242f3090a96..e92522b33c48 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c | |||
| @@ -143,10 +143,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re | |||
| 143 | * CHECK: does overrun affect the current character? | 143 | * CHECK: does overrun affect the current character? |
| 144 | * ASSUMPTION: it does not. | 144 | * ASSUMPTION: it does not. |
| 145 | */ | 145 | */ |
| 146 | if ((ch & port->ignore_status_mask & ~RXSTAT_OVERRUN) == 0) | 146 | uart_insert_char(port, ch, UARTDR_OVERR, ch, flg); |
| 147 | tty_insert_flip_char(tty, ch, flg); | ||
| 148 | if ((ch & ~port->ignore_status_mask & RXSTAT_OVERRUN) == 0) | ||
| 149 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
| 150 | 147 | ||
| 151 | ignore_char: | 148 | ignore_char: |
| 152 | status = clps_readl(SYSFLG(port)); | 149 | status = clps_readl(SYSFLG(port)); |