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

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

Merge tag 'usb-serial-4.4-rc3' of... 

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

 into usb-linus

Johan writes:

USB-serial fixes for v4.4-rc3

Here are some device-id fixes that remove a HID device from cp210x, and
adds support for another Infineon flash-loader device. The flash-loader
device presents itself as a CDC-ACM device even though it is clearly
not, so we need to blacklist it in the cdc-acm driver as well.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents a4861761 a0e80fbd

drivers/usb/class/cdc-acm.c

+5 −0
Original line number Diff line number Diff line
@@ -1838,6 +1838,11 @@ static const struct usb_device_id acm_ids[] = { 
	},

#endif



	/* Exclude Infineon Flash Loader utility */

	{ USB_DEVICE(0x058b, 0x0041),

	.driver_info = IGNORE_DEVICE,

	},



	/* control interfaces without any protocol set */

	{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,

		USB_CDC_PROTO_NONE) },

drivers/usb/serial/cp210x.c

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA80) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */

	{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */

	{ USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */

drivers/usb/serial/usb-serial-simple.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ DEVICE(funsoft, FUNSOFT_IDS); 


/* Infineon Flashloader driver */

#define FLASHLOADER_IDS()		\

	{ USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \

	{ USB_DEVICE(0x8087, 0x0716) }

DEVICE(flashloader, FLASHLOADER_IDS);