diff options
author | Jeremiah Matthey <sprg86@gmail.com> | 2011-08-23 03:44:30 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-08-23 03:44:30 -0400 |
commit | f5e4282586dc0c9dab8c7d32e6c43aa07f68586b (patch) | |
tree | 5895d3135a963c4cb9e506cd74a3e468557ad4c3 /drivers/hid | |
parent | 4a4c879904aa0cc64629e14a49b64fb3d149bf1a (diff) |
HID: usbhid: Add support for SiGma Micro chip
Patch to add SiGma Micro-based keyboards (1c4f:0002) to hid-quirks.
These keyboards dont seem to allow the records to be initialized, and hence a
timeout occurs when the usbhid driver attempts to initialize them. The patch
just adds the signature for these keyboards to the hid-quirks list with the
setting HID_QUIRK_NO_INIT_REPORTS. This removes the 5-10 second wait for the
timeout to occur.
Signed-off-by: Jeremiah Matthey <sprg86@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 61c880939f56..7d27d2b0445a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -579,6 +579,9 @@ | |||
579 | #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 | 579 | #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 |
580 | #define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600 | 580 | #define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600 |
581 | 581 | ||
582 | #define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f | ||
583 | #define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002 | ||
584 | |||
582 | #define USB_VENDOR_ID_SKYCABLE 0x1223 | 585 | #define USB_VENDOR_ID_SKYCABLE 0x1223 |
583 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 | 586 | #define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07 |
584 | 587 | ||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 621959d5cc42..4bdb5d46c52c 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -89,6 +89,7 @@ static const struct hid_blacklist { | |||
89 | 89 | ||
90 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT }, | 90 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT }, |
91 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT }, | 91 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT }, |
92 | { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, | ||
92 | { 0, 0 } | 93 | { 0, 0 } |
93 | }; | 94 | }; |
94 | 95 | ||