Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 237e0153 authored by Matt Burtch's avatar Matt Burtch Committed by Greg Kroah-Hartman
Browse files

USB-Serial: Fix error handling of usb_wwan 



commit 6c1ee66a0b2bdbd64c078fba684d640cf2fd38a9 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c72a0e03

drivers/usb/serial/usb_wwan.c

+10 −10
Original line number Diff line number Diff line
@@ -291,12 +291,13 @@ static void usb_wwan_indat_callback(struct urb *urb) 
			tty_flip_buffer_push(&port->port);

		} else

			dev_dbg(dev, "%s: empty read urb received\n", __func__);



	}

	/* Resubmit urb so we continue receiving */

	err = usb_submit_urb(urb, GFP_ATOMIC);

	if (err) {

		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",

				__func__, err);

			/* busy also in error unless we are killed */

			usb_mark_last_busy(port->serial->dev);

		}
@@ -304,7 +305,6 @@ static void usb_wwan_indat_callback(struct urb *urb) 
		usb_mark_last_busy(port->serial->dev);

	}

}

}



static void usb_wwan_outdat_callback(struct urb *urb)

{