diff options
author | Vasily Titskiy <qehgt0@gmail.com> | 2013-08-30 18:25:04 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-02 07:34:43 -0400 |
commit | 9e0bf92c223dabe0789714f8f85f6e26f8f9cda4 (patch) | |
tree | 8fd37959c38f7e6ddb9b31f2cdd5c5ebc2b0c54b /drivers/hid | |
parent | 60cbd53e4bf623fe978e6f23a6da642e730fde3a (diff) |
HID: usbhid: quirk for N-Trig DuoSense Touch Screen
The DuoSense touchscreen device causes a 10 second timeout. This fix
removes the delay.
Signed-off-by: Vasily Titskiy <qehgt0@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 83622f89fa4b..01f1b876fb9d 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -656,6 +656,7 @@ | |||
656 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012 | 656 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16 0x0012 |
657 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013 | 657 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013 |
658 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014 | 658 | #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014 |
659 | #define USB_DEVICE_ID_NTRIG_DUOSENSE 0x1500 | ||
659 | 660 | ||
660 | #define USB_VENDOR_ID_ONTRAK 0x0a07 | 661 | #define USB_VENDOR_ID_ONTRAK 0x0a07 |
661 | #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 | 662 | #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 19b8360f2330..07345521f421 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -109,6 +109,8 @@ static const struct hid_blacklist { | |||
109 | { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, | 109 | { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, |
110 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, | 110 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, |
111 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT }, | 111 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT }, |
112 | { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS }, | ||
113 | |||
112 | { 0, 0 } | 114 | { 0, 0 } |
113 | }; | 115 | }; |
114 | 116 | ||