Re: [PATCH v2] Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE

Re: [PATCH v2] Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE

[Chris Ye]

+stable@vger.kernel.org

On 11/1/20 11:34 AM, Chris Ye wrote:
> Kernel 5.4 introduces HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE, devices
> need to be set explicitly with this flag.
>
> Signed-off-by: Chris Ye <lzye@google.com>
> ---
>   drivers/hid/hid-ids.h    | 4 ++++
>   drivers/hid/hid-quirks.c | 4 ++++
>   2 files changed, 8 insertions(+)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 74be76e848bf..cf55dca494f3 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -449,6 +449,10 @@
>   #define USB_VENDOR_ID_FRUCTEL	0x25B6
>   #define USB_DEVICE_ID_GAMETEL_MT_MODE	0x0002
>   
> +#define USB_VENDOR_ID_GAMEVICE	0x27F8
> +#define USB_DEVICE_ID_GAMEVICE_GV186	0x0BBE
> +#define USB_DEVICE_ID_GAMEVICE_KISHI	0x0BBF
> +
>   #define USB_VENDOR_ID_GAMERON		0x0810
>   #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001
>   #define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 0440e2f6e8a3..36d94e3485e3 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -84,6 +84,10 @@ static const struct hid_device_id hid_quirks[] = {
>   	{ HID_USB_DEVICE(USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28), HID_QUIRK_NOGET },
>   	{ HID_USB_DEVICE(USB_VENDOR_ID_FUTABA, USB_DEVICE_ID_LED_DISPLAY), HID_QUIRK_NO_INIT_REPORTS },
>   	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD), HID_QUIRK_MULTI_INPUT },
> +	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_GV186),
> +		HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
> +	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_KISHI),
> +		HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
>   	{ HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
>   	{ HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
>   	{ HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },