From: Greg Kroah-Hartman Date: Fri, 13 Jul 2018 13:24:44 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.141~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dccbfa0102cc2c8c76b8ec0b68d611f9c74d6c48;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: hid-usbhid-add-quirk-for-innomedia-innex-genesis-atari-adapter.patch --- diff --git a/queue-4.9/hid-usbhid-add-quirk-for-innomedia-innex-genesis-atari-adapter.patch b/queue-4.9/hid-usbhid-add-quirk-for-innomedia-innex-genesis-atari-adapter.patch new file mode 100644 index 00000000000..fd6da48fa57 --- /dev/null +++ b/queue-4.9/hid-usbhid-add-quirk-for-innomedia-innex-genesis-atari-adapter.patch @@ -0,0 +1,45 @@ +From 9547837bdccb4af127528b36a73377150658b4ac Mon Sep 17 00:00:00 2001 +From: Tomasz Kramkowski +Date: Tue, 14 Feb 2017 23:14:33 +0000 +Subject: HID: usbhid: add quirk for innomedia INNEX GENESIS/ATARI adapter + +From: Tomasz Kramkowski + +commit 9547837bdccb4af127528b36a73377150658b4ac upstream. + +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 +Acked-By: Benjamin Tissoires +Signed-off-by: Jiri Kosina +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hid/hid-ids.h | 3 +++ + drivers/hid/usbhid/hid-quirks.c | 1 + + 2 files changed, 4 insertions(+) + +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -549,6 +549,9 @@ + #define USB_VENDOR_ID_IRTOUCHSYSTEMS 0x6615 + #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB 0x0070 + ++#define USB_VENDOR_ID_INNOMEDIA 0x1292 ++#define USB_DEVICE_ID_INNEX_GENESIS_ATARI 0x4745 ++ + #define USB_VENDOR_ID_ITE 0x048d + #define USB_DEVICE_ID_ITE_LENOVO_YOGA 0x8386 + #define USB_DEVICE_ID_ITE_LENOVO_YOGA2 0x8350 +--- a/drivers/hid/usbhid/hid-quirks.c ++++ b/drivers/hid/usbhid/hid-quirks.c +@@ -170,6 +170,7 @@ static const struct hid_blacklist { + { USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES, HID_QUIRK_MULTI_INPUT }, ++ { USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI, HID_QUIRK_MULTI_INPUT }, + + { 0, 0 } + }; diff --git a/queue-4.9/series b/queue-4.9/series index 6447c44e374..a7989ea81bd 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -15,3 +15,4 @@ usb-yurex-fix-out-of-bounds-uaccess-in-read-handler.patch usb-serial-mos7840-fix-status-register-error-handling.patch usb-quirks-add-delay-quirks-for-corsair-strafe.patch xhci-xhci-mem-off-by-one-in-xhci_stream_id_to_ring.patch +hid-usbhid-add-quirk-for-innomedia-innex-genesis-atari-adapter.patch