Commit 6c1ee66a authored by Matt Burtch's avatar Matt Burtch Committed by Greg Kroah-Hartman

USB-Serial: Fix error handling of usb_wwan

This fixes an issue where the bulk-in urb used for incoming data transfer
is not resubmitted if the packet recieved contains an error status.  This
results in the driver locking until the port is closed and re-opened.

Tested on a custom board with a Cinterion GSM module.
Signed-off-by: default avatarMatt Burtch <matt@grid-net.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec58fad1
...@@ -291,18 +291,18 @@ static void usb_wwan_indat_callback(struct urb *urb) ...@@ -291,18 +291,18 @@ static void usb_wwan_indat_callback(struct urb *urb)
tty_flip_buffer_push(&port->port); tty_flip_buffer_push(&port->port);
} else } else
dev_dbg(dev, "%s: empty read urb received\n", __func__); dev_dbg(dev, "%s: empty read urb received\n", __func__);
}
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
if (err) { if (err) {
if (err != -EPERM) { if (err != -EPERM) {
dev_err(dev, "%s: resubmit read urb failed. (%d)\n", __func__, err); dev_err(dev, "%s: resubmit read urb failed. (%d)\n",
/* busy also in error unless we are killed */ __func__, err);
usb_mark_last_busy(port->serial->dev); /* busy also in error unless we are killed */
}
} else {
usb_mark_last_busy(port->serial->dev); usb_mark_last_busy(port->serial->dev);
} }
} else {
usb_mark_last_busy(port->serial->dev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment