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

Commit 8fd80133 authored by Johannes Steingraeber's avatar Johannes Steingraeber Committed by Greg Kroah-Hartman
Browse files

usb serial: support Alcor Micro Corp. USB 2.0 TO RS-232 through pl2303 driver 



Patch to add support for Alcor Micro Corp. USB 2.0 TO RS-232 converter.
This patch adds VID and PID to pl2303.[ch], adds it to the "HORRIBLE
HACK FOR PL2303" in usb-serial.c and also prevents cdc-acm to claim
driving this device by blacklisting it in hid-core.

Signed-off-by: default avatarJohannes Steingraeber <Jo_Stein@web.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3f542974

drivers/usb/input/hid-core.c

+5 −0
Original line number Diff line number Diff line
@@ -1595,6 +1595,10 @@ void hid_init_reports(struct hid_device *hid) 


#define USB_VENDOR_ID_YEALINK		0x6993

#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001



#define USB_VENDOR_ID_ALCOR		0x058f

#define USB_DEVICE_ID_ALCOR_USBRS232	0x9720



/*

 * Alphabetically sorted blacklist by quirk type.

 */
@@ -1612,6 +1616,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW40, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24, HID_QUIRK_IGNORE },

drivers/usb/serial/pl2303.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static struct usb_device_id id_table [] = { 
	{ USB_DEVICE(SPEEDDRAGON_VENDOR_ID, SPEEDDRAGON_PRODUCT_ID) },

	{ USB_DEVICE(DATAPILOT_U2_VENDOR_ID, DATAPILOT_U2_PRODUCT_ID) },

	{ USB_DEVICE(BELKIN_VENDOR_ID, BELKIN_PRODUCT_ID) },

	{ USB_DEVICE(ALCOR_VENDOR_ID, ALCOR_PRODUCT_ID) },

	{ }					/* Terminating entry */

};

drivers/usb/serial/pl2303.h

+4 −0
Original line number Diff line number Diff line
@@ -89,3 +89,7 @@ 
/* Belkin "F5U257" Serial Adapter */

#define BELKIN_VENDOR_ID	0x050d

#define BELKIN_PRODUCT_ID	0x0257



/* Alcor Micro Corp. USB 2.0 TO RS-232 */

#define ALCOR_VENDOR_ID		0x058F

#define ALCOR_PRODUCT_ID	0x9720

drivers/usb/serial/usb-serial.c

+3 −1
Original line number Diff line number Diff line
@@ -712,7 +712,9 @@ int usb_serial_probe(struct usb_interface *interface, 
	if (((le16_to_cpu(dev->descriptor.idVendor) == PL2303_VENDOR_ID) &&

	     (le16_to_cpu(dev->descriptor.idProduct) == PL2303_PRODUCT_ID)) ||

	    ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) &&

	     (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID))) {

	     (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) ||

	    ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) &&

	     (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) {

		if (interface != dev->actconfig->interface[0]) {

			/* check out the endpoints of the other interface*/

			iface_desc = dev->actconfig->interface[0]->cur_altsetting;