evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

USB: ssu100: fix overrun-error reporting

Browse source 
Fix reporting of overrun errors, which should only be reported once
using the inserted null character.

Fixes: 6b8f1ca558 ("USB: ssu100: set tty_flags in ssu100_process_packet")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2014-11-18 11:25:21 +01:00
parent 855515a6d3
commit 75bcbf29c2
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/usb/serial/ssu100.c
View file

@ -492,8 +492,7 @@ static void ssu100_update_lsr(struct usb_serial_port *port, u8 lsr,
} }
if (lsr & UART_LSR_OE) { if (lsr & UART_LSR_OE) {
port->icount.overrun++; port->icount.overrun++;
if (*tty_flag == TTY_NORMAL) tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);
*tty_flag = TTY_OVERRUN;
} }
} }
@ -511,12 +510,8 @@ static void ssu100_process_read_urb(struct urb *urb)
if ((len >= 4) && if ((len >= 4) &&
(packet[0] == 0x1b) && (packet[1] == 0x1b) && (packet[0] == 0x1b) && (packet[1] == 0x1b) &&
((packet[2] == 0x00) || (packet[2] == 0x01))) { ((packet[2] == 0x00) || (packet[2] == 0x01))) {
if (packet[2] == 0x00) { if (packet[2] == 0x00)
ssu100_update_lsr(port, packet[3], &flag); ssu100_update_lsr(port, packet[3], &flag);
if (flag == TTY_OVERRUN)
tty_insert_flip_char(&port->port, 0,
TTY_OVERRUN);
}
if (packet[2] == 0x01) if (packet[2] == 0x01)
ssu100_update_msr(port, packet[3]); ssu100_update_msr(port, packet[3]);