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

Commit 6d16e9c3 authored by Wanlong Gao's avatar Wanlong Gao Committed by Jiri Kosina
Browse files

HID: usbhid: fix sis quirk 



Since commit 765e5fbd merged the sis quirk,
then USB_VENDOR_ID_SIS2_TOUCH remains undefined.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 12f508ae

drivers/hid/hid-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1822,8 +1822,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },

drivers/hid/hid-multitouch.c

+2 −2
Original line number Diff line number Diff line
@@ -1301,10 +1301,10 @@ static const struct hid_device_id mt_devices[] = { 


	/* SiS panels */

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,

		HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH,

		USB_DEVICE_ID_SIS9200_TOUCH) },

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,

		HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH,

		USB_DEVICE_ID_SIS817_TOUCH) },



	/* Stantum panels */