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

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

Merge tag 'usb-serial-4.10-rc6' of... 

Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v4.10-rc6

Just a couple of new device ids.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 83e526f2 5d03a2fd

drivers/usb/serial/option.c

+1 −0
Original line number Diff line number Diff line
@@ -2007,6 +2007,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD200, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_6802, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD300, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x421d, 0xff, 0xff, 0xff) }, /* HP lt2523 (Novatel E371) */

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);

drivers/usb/serial/qcserial.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static const struct usb_device_id id_table[] = { 
	{USB_DEVICE(0x1410, 0xa021)},	/* Novatel Gobi 3000 Composite */

	{USB_DEVICE(0x413c, 0x8193)},	/* Dell Gobi 3000 QDL */

	{USB_DEVICE(0x413c, 0x8194)},	/* Dell Gobi 3000 Composite */

	{USB_DEVICE(0x413c, 0x81a6)},	/* Dell DW5570 QDL (MC8805) */

	{USB_DEVICE(0x1199, 0x68a4)},	/* Sierra Wireless QDL */

	{USB_DEVICE(0x1199, 0x68a5)},	/* Sierra Wireless Modem */

	{USB_DEVICE(0x1199, 0x68a8)},	/* Sierra Wireless QDL */