Skip to content

Commit 6d16e9c

Browse files
gaowanlongJiri Kosina
authored andcommitted
HID: usbhid: fix sis quirk
Since commit 765e5fb merged the sis quirk, then USB_VENDOR_ID_SIS2_TOUCH remains undefined. Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Wanlong Gao <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 12f508a commit 6d16e9c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/hid/hid-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,8 +1822,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
18221822
{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },
18231823
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
18241824
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
1825-
{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) },
1826-
{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) },
1825+
{ HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) },
1826+
{ HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) },
18271827
{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
18281828
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },
18291829
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },

drivers/hid/hid-multitouch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,10 +1301,10 @@ static const struct hid_device_id mt_devices[] = {
13011301

13021302
/* SiS panels */
13031303
{ .driver_data = MT_CLS_DEFAULT,
1304-
HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,
1304+
HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH,
13051305
USB_DEVICE_ID_SIS9200_TOUCH) },
13061306
{ .driver_data = MT_CLS_DEFAULT,
1307-
HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH,
1307+
HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH,
13081308
USB_DEVICE_ID_SIS817_TOUCH) },
13091309

13101310
/* Stantum panels */

0 commit comments

Comments
 (0)