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/sa1100.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/sa1100.c')
| -rw-r--r-- | drivers/serial/sa1100.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 157218bc6c6f..22565a67a57c 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
| @@ -237,10 +237,7 @@ sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) | |||
| 237 | if (uart_handle_sysrq_char(&sport->port, ch, regs)) | 237 | if (uart_handle_sysrq_char(&sport->port, ch, regs)) |
| 238 | goto ignore_char; | 238 | goto ignore_char; |
| 239 | 239 | ||
| 240 | if ((status & port->ignore_status_mask & ~UTSR1_TO_SM(UTSR1_ROR)) == 0) | 240 | uart_insert_char(&sport->port, status, UTSR1_TO_SM(UTSR1_ROR), ch, flg); |
| 241 | tty_insert_flip_char(tty, ch, flg); | ||
| 242 | if (status & ~port->ignore_status_mask & UTSR1_TO_SM(UTSR1_ROR)) | ||
| 243 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
| 244 | 241 | ||
| 245 | ignore_char: | 242 | ignore_char: |
| 246 | status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | | 243 | status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | |