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

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

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

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

 into usb-linus

Johan writes:

USB-serial fixes for v4.2-rc5

Here's a fix for some Sierra Wireless modems and a couple of new device
ids.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 84b6b023 74472233

drivers/usb/serial/option.c

+2 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */

	{ USB_DEVICE_INTERFACE_CLASS(SIERRA_VENDOR_ID, 0x68c0, 0xff),

	  .driver_info = (kernel_ulong_t)&sierra_mc73xx_blacklist }, /* MC73xx */

	{ USB_DEVICE_INTERFACE_CLASS(SIERRA_VENDOR_ID, 0x9041, 0xff),

	  .driver_info = (kernel_ulong_t)&sierra_mc73xx_blacklist }, /* MC7305/MC7355 */

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),

drivers/usb/serial/qcserial.c

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

	{DEVICE_SWI(0x1199, 0x901f)},	/* Sierra Wireless EM7355 */

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

	{DEVICE_SWI(0x1199, 0x9041)},	/* Sierra Wireless MC7305/MC7355 */

	{DEVICE_SWI(0x1199, 0x9051)},	/* Netgear AirCard 340U */

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

	{DEVICE_SWI(0x1199, 0x9054)},	/* Sierra Wireless Modem */
@@ -158,6 +157,7 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x413c, 0x81a4)},	/* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81a8)},	/* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81a9)},	/* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81b1)},	/* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */



	/* Huawei devices */

	{DEVICE_HWI(0x03f0, 0x581d)},	/* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */

drivers/usb/serial/sierra.c

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68AA, 0xFF, 0xFF, 0xFF),

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

	{ USB_DEVICE(0x1199, 0x68AB) }, /* Sierra Wireless AR8550 */

	/* AT&T Direct IP LTE modems */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist