Commit 084d7e78 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-5.7-rc5' of... 

Merge tag 'usb-serial-5.7-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for 5.7-rc5

Here's a fix adding a missing input sanity check and a new modem device
id.

Both have been in linux-next with no reported issues.

* tag 'usb-serial-5.7-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: qcserial: Add DW5816e support
  USB: serial: garmin_gps: add sanity checking for data length
parents 7990be48 78d6de3c

drivers/usb/serial/garmin_gps.c

+2 −2
Original line number Diff line number Diff line
@@ -1138,8 +1138,8 @@ static void garmin_read_process(struct garmin_data *garmin_data_p, 
		   send it directly to the tty port */

		if (garmin_data_p->flags & FLAGS_QUEUING) {

			pkt_add(garmin_data_p, data, data_length);

		} else if (bulk_data ||

			   getLayerId(data) == GARMIN_LAYERID_APPL) {

		} else if (bulk_data || (data_length >= sizeof(u32) &&

				getLayerId(data) == GARMIN_LAYERID_APPL)) {



			spin_lock_irqsave(&garmin_data_p->lock, flags);

			garmin_data_p->flags |= APP_RESP_SEEN;

drivers/usb/serial/qcserial.c

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x413c, 0x81b3)},	/* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */

	{DEVICE_SWI(0x413c, 0x81b5)},	/* Dell Wireless 5811e QDL */

	{DEVICE_SWI(0x413c, 0x81b6)},	/* Dell Wireless 5811e QDL */

	{DEVICE_SWI(0x413c, 0x81cc)},	/* Dell Wireless 5816e */

	{DEVICE_SWI(0x413c, 0x81cf)},   /* Dell Wireless 5819 */

	{DEVICE_SWI(0x413c, 0x81d0)},   /* Dell Wireless 5819 */

	{DEVICE_SWI(0x413c, 0x81d1)},   /* Dell Wireless 5818 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE