diff options
Diffstat (limited to 'drivers/serial/amba-pl011.c')
| -rw-r--r-- | drivers/serial/amba-pl011.c | 14 | 
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index d5cbef3fe8b6..7db88ee18f75 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c  | |||
| @@ -163,18 +163,8 @@ pl011_rx_chars(struct uart_amba_port *uap) | |||
| 163 | if (uart_handle_sysrq_char(&uap->port, ch, regs)) | 163 | if (uart_handle_sysrq_char(&uap->port, ch, regs)) | 
| 164 | goto ignore_char; | 164 | goto ignore_char; | 
| 165 | 165 | ||
| 166 | if ((rsr & uap->port.ignore_status_mask) == 0) { | 166 | uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag); | 
| 167 | tty_insert_flip_char(tty, ch, flag); | 167 | |
| 168 | } | ||
| 169 | if ((rsr & UART01x_RSR_OE) && | ||
| 170 | tty->flip.count < TTY_FLIPBUF_SIZE) { | ||
| 171 | /* | ||
| 172 | * Overrun is special, since it's reported | ||
| 173 | * immediately, and doesn't affect the current | ||
| 174 | * character | ||
| 175 | */ | ||
| 176 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
| 177 | } | ||
| 178 | ignore_char: | 168 | ignore_char: | 
| 179 | status = readw(uap->port.membase + UART01x_FR); | 169 | status = readw(uap->port.membase + UART01x_FR); | 
| 180 | } | 170 | } | 
