| From 57be2961ddc2f9bfa6f41e123b183fe5a43ee9ad Mon Sep 17 00:00:00 2001 |
| From: Marcel Hasler <mahasler@gmail.com> |
| Date: Thu, 3 Nov 2016 19:47:26 +0100 |
| Subject: [PATCH] HID: usbhid: Add quirks for Mayflash/Dragonrise GameCube and |
| PS3 adapters |
| |
| commit b2554000f5b5d2a3a368d09c6debf7da64901fcf upstream. |
| |
| All known gamepad adapters by Mayflash (identified as Dragonrise) need |
| HID_QUIRK_MULTI_INPUT to split them up into four input devices. Without this |
| quirk those adapters are falsely recognized as tablets. Fixes bug 115841 |
| (https://bugzilla.kernel.org/show_bug.cgi?id=115841). |
| |
| Signed-off-by: Marcel Hasler <mahasler@gmail.com> |
| Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h |
| index cdea2cb911b0..feb08fae0e54 100644 |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -317,8 +317,10 @@ |
| #define USB_VENDOR_ID_DMI 0x0c0b |
| #define USB_DEVICE_ID_DMI_ENC 0x5fab |
| |
| -#define USB_VENDOR_ID_DRAGONRISE 0x0079 |
| -#define USB_DEVICE_ID_DRAGONRISE_WIIU 0x1800 |
| +#define USB_VENDOR_ID_DRAGONRISE 0x0079 |
| +#define USB_DEVICE_ID_DRAGONRISE_WIIU 0x1800 |
| +#define USB_DEVICE_ID_DRAGONRISE_PS3 0x1801 |
| +#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE 0x1843 |
| |
| #define USB_VENDOR_ID_DWAV 0x0eef |
| #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 |
| diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c |
| index 862d6800e751..182d3a2b6c7c 100644 |
| --- a/drivers/hid/usbhid/hid-quirks.c |
| +++ b/drivers/hid/usbhid/hid-quirks.c |
| @@ -82,6 +82,8 @@ static const struct hid_blacklist { |
| { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET }, |
| { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, |
| { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT }, |
| + { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT }, |
| + { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT }, |
| { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL }, |
| { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, |
| { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, |
| -- |
| 2.12.0 |
| |
