HID: hid-plantronics: Re-resend Update to map button for PTT products

[ Upstream commit 37e376df5f4993677c33968a0c19b0c5acbf1108 ]

Add a mapping for Push-To-Talk joystick trigger button.

Tested on ChromeBox/ChromeBook with various Plantronics devices.

Signed-off-by: Terry Junge <terry.junge@plantronics.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c
index febb21ee190e99134ae995887ceeeb86721e1440..584b10d3fc3d84d026c56e4ae4b74fb7b2525d69 100644 (file)
--- a/drivers/hid/hid-plantronics.c
+++ b/drivers/hid/hid-plantronics.c
@@ -2,7 +2,7 @@
  *  Plantronics USB HID Driver
  *
  *  Copyright (c) 2014 JD Cole <jd.cole@plantronics.com>
- *  Copyright (c) 2015 Terry Junge <terry.junge@plantronics.com>
+ *  Copyright (c) 2015-2018 Terry Junge <terry.junge@plantronics.com>
  */
 
 /*
@@ -48,6 +48,10 @@ static int plantronics_input_mapping(struct hid_device *hdev,
        unsigned short mapped_key;
        unsigned long plt_type = (unsigned long)hid_get_drvdata(hdev);
 
+       /* special case for PTT products */
+       if (field->application == HID_GD_JOYSTICK)
+               goto defaulted;
+
        /* handle volume up/down mapping */
        /* non-standard types or multi-HID interfaces - plt_type is PID */
        if (!(plt_type & HID_USAGE_PAGE)) {