diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:51:28 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:51:28 -0400 |
commit | 4b5730fafb6287bdeed6af914fe90ed9e114d9a6 (patch) | |
tree | d2cdd4fb675b69ed07ce0addc4af7593df3045a5 | |
parent | 99759619b27662d1290901228d77a293e6e83200 (diff) |
HID: add support for barcode scanners from Symbol Technologies
Barcode handheld scanners produced by Symbol Technologies (0x05e0/0x0800
and 0x05e0/0x1300) need HID_QUIRK_NOGET, otherwise their firmware exposes
trouble during enumeration/initialization.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-ids.h | 4 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d485894ff4db..be5cf24401bf 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -544,6 +544,10 @@ | |||
544 | #define USB_VENDOR_ID_SUNPLUS 0x04fc | 544 | #define USB_VENDOR_ID_SUNPLUS 0x04fc |
545 | #define USB_DEVICE_ID_SUNPLUS_WDESKTOP 0x05d8 | 545 | #define USB_DEVICE_ID_SUNPLUS_WDESKTOP 0x05d8 |
546 | 546 | ||
547 | #define USB_VENDOR_ID_SYMBOL 0x05e0 | ||
548 | #define USB_DEVICE_ID_SYMBOL_SCANNER_1 0x0800 | ||
549 | #define USB_DEVICE_ID_SYMBOL_SCANNER_2 0x1300 | ||
550 | |||
547 | #define USB_VENDOR_ID_THRUSTMASTER 0x044f | 551 | #define USB_VENDOR_ID_THRUSTMASTER 0x044f |
548 | 552 | ||
549 | #define USB_VENDOR_ID_TOPSEED 0x0766 | 553 | #define USB_VENDOR_ID_TOPSEED 0x0766 |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 9a94b643ccde..c09fa0c297c7 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -67,6 +67,8 @@ static const struct hid_blacklist { | |||
67 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, | 67 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, |
68 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET }, | 68 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET }, |
69 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, | 69 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
70 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET }, | ||
71 | { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET }, | ||
70 | { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, | 72 | { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, |
71 | { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT }, | 73 | { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT }, |
72 | { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U, HID_QUIRK_MULTI_INPUT }, | 74 | { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U, HID_QUIRK_MULTI_INPUT }, |