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

Commit b0be5b3b authored by Simon Farnsworth's avatar Simon Farnsworth Committed by Jiri Kosina
Browse files

HID: Remove duplicate ID for QUANTA 3001 touchscreen 



For some reason, we had two IDs for the QUANTA 3001 touchscreen controller,
one USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 and one
USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN. As this has caused
confusion, remove USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN
completely, and fix places where it was used to refer to
USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001.

Signed-off-by: default avatarSimon Farnsworth <simon.farnsworth@onelan.co.uk>
Acked-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent bcb4a75b

drivers/hid/hid-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -654,7 +654,6 @@ 
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH		0x3000

#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001		0x3001

#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008		0x3008

#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN	0x3001



#define USB_VENDOR_ID_ROCCAT		0x1e7d

#define USB_DEVICE_ID_ROCCAT_ARVO	0x30d4

drivers/hid/usbhid/hid-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },