diff options
| author | Tomasz Kramkowski <tk@the-tk.com> | 2017-02-14 18:14:33 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-03-06 08:03:53 -0500 |
| commit | 9547837bdccb4af127528b36a73377150658b4ac (patch) | |
| tree | b7120967571b6e8f2f5ff45b089526697e702474 | |
| parent | 3f3752705dbd50b66b66ad7b4d54fe33d2f746ed (diff) | |
HID: usbhid: add quirk for innomedia INNEX GENESIS/ATARI adapter
The (1292:4745) Innomedia INNEX GENESIS/ATARI adapter needs
HID_QUIRK_MULTI_INPUT to split the device up into two controllers
instead of inputs from both being merged into one.
Signed-off-by: Tomasz Kramkowski <tk@the-tk.com>
Acked-By: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -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 86c95d30ac80..758e16037869 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -545,6 +545,9 @@ | |||
| 545 | #define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 | 545 | #define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 |
| 546 | #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 | 546 | #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 |
| 547 | 547 | ||
| 548 | #define USB_VENDOR_ID_INNOMEDIA 0x1292 | ||
| 549 | #define USB_DEVICE_ID_INNEX_GENESIS_ATARI 0x4745 | ||
| 550 | |||
| 548 | #define USB_VENDOR_ID_ITE 0x048d | 551 | #define USB_VENDOR_ID_ITE 0x048d |
| 549 | #define USB_DEVICE_ID_ITE_LENOVO_YOGA 0x8386 | 552 | #define USB_DEVICE_ID_ITE_LENOVO_YOGA 0x8386 |
| 550 | #define USB_DEVICE_ID_ITE_LENOVO_YOGA2 0x8350 | 553 | #define USB_DEVICE_ID_ITE_LENOVO_YOGA2 0x8350 |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index d6847a664446..f27921efe8fc 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -162,6 +162,7 @@ static const struct hid_blacklist { | |||
| 162 | { USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD, HID_QUIRK_MULTI_INPUT }, | 162 | { USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD, HID_QUIRK_MULTI_INPUT }, |
| 163 | { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES, HID_QUIRK_MULTI_INPUT }, | 163 | { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES, HID_QUIRK_MULTI_INPUT }, |
| 164 | { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES, HID_QUIRK_MULTI_INPUT }, | 164 | { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES, HID_QUIRK_MULTI_INPUT }, |
| 165 | { USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI, HID_QUIRK_MULTI_INPUT }, | ||
| 165 | 166 | ||
| 166 | { 0, 0 } | 167 | { 0, 0 } |
| 167 | }; | 168 | }; |
