diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-22 18:29:38 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-22 18:29:38 +0300 |
| commit | da571b2d1c09482b680d54e8392018df4fe4f980 (patch) | |
| tree | 1944b11049202b4efdbd5a9d6497e67f24806788 /drivers/usb/serial/ssu100.c | |
| parent | 2aea83a484fc6739a05c2bc438ad4cea1d97dc87 (diff) | |
| parent | 75bcbf29c284dd0154c3e895a0bd1ef0e796160e (diff) | |
| download | linux-da571b2d1c09482b680d54e8392018df4fe4f980.tar.xz | |
Merge tag 'usb-serial-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v3.18-rc6
Three fixes for bugs related to TTY error reporting, which can to lead
to data being dropped by the line discipline.
Included is also some new device ids for ftdi_sio and cp210x.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ssu100.c')
| -rw-r--r-- | drivers/usb/serial/ssu100.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c index a7fe664b6b7d..70a098de429f 100644 --- a/drivers/usb/serial/ssu100.c +++ b/drivers/usb/serial/ssu100.c @@ -490,10 +490,9 @@ static void ssu100_update_lsr(struct usb_serial_port *port, u8 lsr, if (*tty_flag == TTY_NORMAL) *tty_flag = TTY_FRAME; } - if (lsr & UART_LSR_OE){ + if (lsr & UART_LSR_OE) { port->icount.overrun++; - if (*tty_flag == TTY_NORMAL) - *tty_flag = TTY_OVERRUN; + tty_insert_flip_char(&port->port, 0, TTY_OVERRUN); } } @@ -511,12 +510,8 @@ static void ssu100_process_read_urb(struct urb *urb) if ((len >= 4) && (packet[0] == 0x1b) && (packet[1] == 0x1b) && ((packet[2] == 0x00) || (packet[2] == 0x01))) { - if (packet[2] == 0x00) { + if (packet[2] == 0x00) ssu100_update_lsr(port, packet[3], &flag); - if (flag == TTY_OVERRUN) - tty_insert_flip_char(&port->port, 0, - TTY_OVERRUN); - } if (packet[2] == 0x01) ssu100_update_msr(port, packet[3]); |