Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

USB: keyspan: fix overrun-error reporting

Browse source 
Fix reporting of overrun errors, which are not associated with a
character. Instead insert a null character and report only once.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
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:20 +01:00
parent 5d1678a33c
commit 855515a6d3
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/serial/keyspan.c
View file

@ -311,12 +311,13 @@ static void usa26_indat_callback(struct urb *urb)
if ((data[0] & 0x80) == 0) { if ((data[0] & 0x80) == 0) {
/* no errors on individual bytes, only /* no errors on individual bytes, only
possible overrun err */ possible overrun err */
if (data[0] & RXERROR_OVERRUN) if (data[0] & RXERROR_OVERRUN) {
err = TTY_OVERRUN; tty_insert_flip_char(&port->port, 0,
else TTY_OVERRUN);
err = 0; }
for (i = 1; i < urb->actual_length ; ++i) for (i = 1; i < urb->actual_length ; ++i)
tty_insert_flip_char(&port->port, data[i], err); tty_insert_flip_char(&port->port, data[i],
TTY_NORMAL);
} else { } else {
/* some bytes had errors, every byte has status */ /* some bytes had errors, every byte has status */
dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__); dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__);
@ -787,13 +788,13 @@ static void usa90_indat_callback(struct urb *urb)
if ((data[0] & 0x80) == 0) { if ((data[0] & 0x80) == 0) {
/* no errors on individual bytes, only /* no errors on individual bytes, only
possible overrun err*/ possible overrun err*/
if (data[0] & RXERROR_OVERRUN) if (data[0] & RXERROR_OVERRUN) {
err = TTY_OVERRUN; tty_insert_flip_char(&port->port, 0,
else TTY_OVERRUN);
err = 0; }
for (i = 1; i < urb->actual_length ; ++i) for (i = 1; i < urb->actual_length ; ++i)
tty_insert_flip_char(&port->port, tty_insert_flip_char(&port->port,
data[i], err); data[i], TTY_NORMAL);
} else { } else {
/* some bytes had errors, every byte has status */ /* some bytes had errors, every byte has status */
dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__); dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__);