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

Commit 765e5fbd authored by AceLan Kao's avatar AceLan Kao Committed by Jiri Kosina
Browse files

HID: usbhid: merge the sis quirk 



USB_VENDOR_ID_SIS and USB_VENDOR_ID_SIS2_TOUCH are identical,
so refine the code and merge the quirks.

Signed-off-by: default avatarAceLan Kao <acelan.kao@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9fee8240

drivers/hid/hid-ids.h

+2 −3
Original line number Diff line number Diff line
@@ -755,9 +755,10 @@ 
#define USB_VENDOR_ID_SIGMATEL		0x066F

#define USB_DEVICE_ID_SIGMATEL_STMP3780	0x3780



#define USB_VENDOR_ID_SIS2_TOUCH	0x0457

#define USB_VENDOR_ID_SIS_TOUCH		0x0457

#define USB_DEVICE_ID_SIS9200_TOUCH	0x9200

#define USB_DEVICE_ID_SIS817_TOUCH	0x0817

#define USB_DEVICE_ID_SIS_TS		0x1013



#define USB_VENDOR_ID_SKYCABLE			0x1223

#define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
@@ -936,7 +937,5 @@ 
#define USB_VENDOR_ID_PRIMAX	0x0461

#define USB_DEVICE_ID_PRIMAX_KEYBOARD	0x4e05



#define USB_VENDOR_ID_SIS	0x0457

#define USB_DEVICE_ID_SIS_TS	0x1013



#endif

drivers/hid/usbhid/hid-quirks.c

+3 −3
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
@@ -114,7 +115,6 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS1, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_SIS, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS },



	{ 0, 0 }

};