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

Merge tag 'usb-serial-5.6-rc7' of... 

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

Johan writes:

USB-serial fixes for 5.6-rc7

Here are a couple of new device ids for 5.6-rc.

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

* tag 'usb-serial-5.6-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: pl2303: add device-id for HP LD381
  USB: serial: option: add ME910G1 ECM composition 0x110b
parents b401f8c4 cecc113c

drivers/usb/serial/option.c

+2 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(0) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110a, 0xff),	/* Telit ME910G1 */

	  .driver_info = NCTRL(0) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110b, 0xff),	/* Telit ME910G1 (ECM) */

	  .driver_info = NCTRL(0) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),

	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910_USBCFG4),

drivers/usb/serial/pl2303.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LD220TA_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LD381_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LD960_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LD960TA_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) },

drivers/usb/serial/pl2303.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
#define HP_LM920_PRODUCT_ID	0x026b

#define HP_TD620_PRODUCT_ID	0x0956

#define HP_LD960_PRODUCT_ID	0x0b39

#define HP_LD381_PRODUCT_ID	0x0f7f

#define HP_LCM220_PRODUCT_ID	0x3139

#define HP_LCM960_PRODUCT_ID	0x3239

#define HP_LD220_PRODUCT_ID	0x3524

CRA Git | Maintained and supported by SUSTech CRA and CCSE