diff options
| author | Mark Brown <broonie@kernel.org> | 2014-08-29 21:38:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-08-29 21:38:11 +0100 |
| commit | 8d60710642cf8f36e8d21d9e9fd4b9536864f2f5 (patch) | |
| tree | 06a65dd8c9c712a2a487cad5454bde23f27a0b23 /drivers/tty | |
| parent | 39d0ded894259789f1524d6097b81052bafb9f58 (diff) | |
| parent | 7f363d2d04aa06a58619ffb5f22a84ae4f362c17 (diff) | |
Merge tag 'v3.10.53' into linux-linaro-lsk
This is the 3.10.53 stable release
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sunsab.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c index a422c8b55a47..aa53fee1df63 100644 --- a/drivers/tty/serial/sunsab.c +++ b/drivers/tty/serial/sunsab.c @@ -157,6 +157,15 @@ receive_chars(struct uart_sunsab_port *up, (up->port.line == up->port.cons->index)) saw_console_brk = 1; + if (count == 0) { + if (unlikely(stat->sreg.isr1 & SAB82532_ISR1_BRK)) { + stat->sreg.isr0 &= ~(SAB82532_ISR0_PERR | + SAB82532_ISR0_FERR); + up->port.icount.brk++; + uart_handle_break(&up->port); + } + } + for (i = 0; i < count; i++) { unsigned char ch = buf[i], flag; |