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

Commit ad2905f0 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

USB HID: fix hid_blacklist clash for 0x08ca/0x0010 



commit d8c8a393 introduced a clash in
hid_blacklist for 0x08ca/0x0010 (GTCO vs. AIPTEK). As the vendor of
GTCO device doesn't seem to be interested in supporting their legacy
HW with this conflicting ids, it is OK to remove it.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 767fe787

drivers/usb/input/hid-core.c

+0 −3
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ void usbhid_init_reports(struct hid_device *hid) 
}



#define USB_VENDOR_ID_GTCO		0x078c

#define USB_VENDOR_ID_GTCO_IPANEL_1	0x08ca

#define USB_VENDOR_ID_GTCO_IPANEL_2     0x5543

#define USB_DEVICE_ID_GTCO_90		0x0090

#define USB_DEVICE_ID_GTCO_100		0x0100
@@ -629,7 +628,6 @@ void usbhid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_GTCO_1004		0x1004

#define USB_DEVICE_ID_GTCO_1005		0x1005

#define USB_DEVICE_ID_GTCO_1006		0x1006

#define USB_DEVICE_ID_GTCO_10		0x0010

#define USB_DEVICE_ID_GTCO_8		0x0008

#define USB_DEVICE_ID_GTCO_d            0x000d
@@ -883,7 +881,6 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },