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

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

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

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

 into usb-linus

Johan writes:

USB-serial fixes for v4.12-rc6

Here are some new modem device ids.

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

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 41f1830f 996fab55

drivers/usb/serial/option.c

+4 −0
Original line number Diff line number Diff line
@@ -1877,6 +1877,10 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = (kernel_ulong_t)&four_g_w100_blacklist

	},

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff),

	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },

	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff),

	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },

	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },

drivers/usb/serial/qcserial.c

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x1199, 0x9056)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9060)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9061)},	/* Sierra Wireless Modem */

	{DEVICE_SWI(0x1199, 0x9063)},	/* Sierra Wireless EM7305 */

	{DEVICE_SWI(0x1199, 0x9070)},	/* Sierra Wireless MC74xx */

	{DEVICE_SWI(0x1199, 0x9071)},	/* Sierra Wireless MC74xx */

	{DEVICE_SWI(0x1199, 0x9078)},	/* Sierra Wireless EM74xx */