diff options
-rw-r--r-- | drivers/hid/hid-ids.h | 5 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 76559629568c..90e9806e864b 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -755,9 +755,10 @@ | |||
755 | #define USB_VENDOR_ID_SIGMATEL 0x066F | 755 | #define USB_VENDOR_ID_SIGMATEL 0x066F |
756 | #define USB_DEVICE_ID_SIGMATEL_STMP3780 0x3780 | 756 | #define USB_DEVICE_ID_SIGMATEL_STMP3780 0x3780 |
757 | 757 | ||
758 | #define USB_VENDOR_ID_SIS2_TOUCH 0x0457 | 758 | #define USB_VENDOR_ID_SIS_TOUCH 0x0457 |
759 | #define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 | 759 | #define USB_DEVICE_ID_SIS9200_TOUCH 0x9200 |
760 | #define USB_DEVICE_ID_SIS817_TOUCH 0x0817 | 760 | #define USB_DEVICE_ID_SIS817_TOUCH 0x0817 |
761 | #define USB_DEVICE_ID_SIS_TS 0x1013 | ||
761 | 762 | ||
762 | #define USB_VENDOR_ID_SKYCABLE 0x1223 | 763 | #define USB_VENDOR_ID_SKYCABLE 0x1223 |
763 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 | 764 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 |
@@ -936,7 +937,5 @@ | |||
936 | #define USB_VENDOR_ID_PRIMAX 0x0461 | 937 | #define USB_VENDOR_ID_PRIMAX 0x0461 |
937 | #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 | 938 | #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 |
938 | 939 | ||
939 | #define USB_VENDOR_ID_SIS 0x0457 | ||
940 | #define USB_DEVICE_ID_SIS_TS 0x1013 | ||
941 | 940 | ||
942 | #endif | 941 | #endif |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 0db9a67278ba..37307dc2d1f7 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -84,8 +84,9 @@ static const struct hid_blacklist { | |||
84 | { USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS }, | 84 | { USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS }, |
85 | { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, | 85 | { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, |
86 | { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET }, | 86 | { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET }, |
87 | { USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET }, | 87 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH, HID_QUIRK_NOGET }, |
88 | { USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET }, | 88 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH, HID_QUIRK_NOGET }, |
89 | { USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS }, | ||
89 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, | 90 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
90 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, | 91 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, |
91 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, | 92 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, |
@@ -114,7 +115,6 @@ static const struct hid_blacklist { | |||
114 | { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS }, | 115 | { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS }, |
115 | { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS1, HID_QUIRK_NO_INIT_REPORTS }, | 116 | { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS1, HID_QUIRK_NO_INIT_REPORTS }, |
116 | { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS }, | 117 | { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS }, |
117 | { USB_VENDOR_ID_SIS, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS }, | ||
118 | 118 | ||
119 | { 0, 0 } | 119 | { 0, 0 } |
120 | }; | 120 | }; |