aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Junge <terry.junge@plantronics.com>2018-04-30 16:32:46 -0400
committerJiri Kosina <jkosina@suse.cz>2018-05-16 05:06:40 -0400
commit37e376df5f4993677c33968a0c19b0c5acbf1108 (patch)
tree488a18f56e412f179c0cfc6c9d5160c944072a8a
parent008464a9360e31b14677457dcd976fbf9dd58e2e (diff)
HID: hid-plantronics: Re-resend Update to map button for PTT products
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>
-rw-r--r--drivers/hid/hid-plantronics.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c
index febb21ee190e..584b10d3fc3d 100644
--- a/drivers/hid/hid-plantronics.c
+++ b/drivers/hid/hid-plantronics.c
@@ -2,7 +2,7 @@
2 * Plantronics USB HID Driver 2 * Plantronics USB HID Driver
3 * 3 *
4 * Copyright (c) 2014 JD Cole <jd.cole@plantronics.com> 4 * Copyright (c) 2014 JD Cole <jd.cole@plantronics.com>
5 * Copyright (c) 2015 Terry Junge <terry.junge@plantronics.com> 5 * Copyright (c) 2015-2018 Terry Junge <terry.junge@plantronics.com>
6 */ 6 */
7 7
8/* 8/*
@@ -48,6 +48,10 @@ static int plantronics_input_mapping(struct hid_device *hdev,
48 unsigned short mapped_key; 48 unsigned short mapped_key;
49 unsigned long plt_type = (unsigned long)hid_get_drvdata(hdev); 49 unsigned long plt_type = (unsigned long)hid_get_drvdata(hdev);
50 50
51 /* special case for PTT products */
52 if (field->application == HID_GD_JOYSTICK)
53 goto defaulted;
54
51 /* handle volume up/down mapping */ 55 /* handle volume up/down mapping */
52 /* non-standard types or multi-HID interfaces - plt_type is PID */ 56 /* non-standard types or multi-HID interfaces - plt_type is PID */
53 if (!(plt_type & HID_USAGE_PAGE)) { 57 if (!(plt_type & HID_USAGE_PAGE)) {