diff options
author | Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net> | 2014-08-03 10:01:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-04 20:01:49 -0400 |
commit | fe418231b195c205701c0cc550a03f6c9758fd9e (patch) | |
tree | eb9156a457c20049e76c7aaf95e581998500be55 /drivers/tty | |
parent | 5cdceab3d5e02eb69ea0f5d8fa9181800baf6f77 (diff) |
sunsab: Fix detection of BREAK on sunsab serial console
Fix detection of BREAK on sunsab serial console: BREAK detection was only
performed when there were also serial characters received simultaneously.
To handle all BREAKs correctly, the check for BREAK and the corresponding
call to uart_handle_break() must also be done if count == 0, therefore
duplicate this code fragment and pull it out of the loop over the received
characters.
Patch applies to 3.16-rc6.
Signed-off-by: Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 2f57df9a71d9..a1e09c0d46f2 100644 --- a/drivers/tty/serial/sunsab.c +++ b/drivers/tty/serial/sunsab.c | |||
@@ -157,6 +157,15 @@ receive_chars(struct uart_sunsab_port *up, | |||
157 | (up->port.line == up->port.cons->index)) | 157 | (up->port.line == up->port.cons->index)) |
158 | saw_console_brk = 1; | 158 | saw_console_brk = 1; |
159 | 159 | ||
160 | if (count == 0) { | ||
161 | if (unlikely(stat->sreg.isr1 & SAB82532_ISR1_BRK)) { | ||
162 | stat->sreg.isr0 &= ~(SAB82532_ISR0_PERR | | ||
163 | SAB82532_ISR0_FERR); | ||
164 | up->port.icount.brk++; | ||
165 | uart_handle_break(&up->port); | ||
166 | } | ||
167 | } | ||
168 | |||
160 | for (i = 0; i < count; i++) { | 169 | for (i = 0; i < count; i++) { |
161 | unsigned char ch = buf[i], flag; | 170 | unsigned char ch = buf[i], flag; |
162 | 171 | ||