diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /drivers/serial/clps711x.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/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)); |