projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a65d4bac GKH |
1 | From foo@baz Sat Jul 28 10:25:26 CEST 2018 |
| 2 | From: Terry Junge <terry.junge@plantronics.com> | |
| 3 | Date: Mon, 30 Apr 2018 13:32:46 -0700 | |
| 4 | Subject: HID: hid-plantronics: Re-resend Update to map button for PTT products | |
| 5 | ||
| 6 | From: Terry Junge <terry.junge@plantronics.com> | |
| 7 | ||
| 8 | [ Upstream commit 37e376df5f4993677c33968a0c19b0c5acbf1108 ] | |
| 9 | ||
| 10 | Add a mapping for Push-To-Talk joystick trigger button. | |
| 11 | ||
| 12 | Tested on ChromeBox/ChromeBook with various Plantronics devices. | |
| 13 | ||
| 14 | Signed-off-by: Terry Junge <terry.junge@plantronics.com> | |
| 15 | Signed-off-by: Jiri Kosina <jkosina@suse.cz> | |
| 16 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 18 | --- | |
| 19 | drivers/hid/hid-plantronics.c | 6 +++++- | |
| 20 | 1 file changed, 5 insertions(+), 1 deletion(-) | |
| 21 | ||
| 22 | --- a/drivers/hid/hid-plantronics.c | |
| 23 | +++ b/drivers/hid/hid-plantronics.c | |
| 24 | @@ -2,7 +2,7 @@ | |
| 25 | * Plantronics USB HID Driver | |
| 26 | * | |
| 27 | * Copyright (c) 2014 JD Cole <jd.cole@plantronics.com> | |
| 28 | - * Copyright (c) 2015 Terry Junge <terry.junge@plantronics.com> | |
| 29 | + * Copyright (c) 2015-2018 Terry Junge <terry.junge@plantronics.com> | |
| 30 | */ | |
| 31 | ||
| 32 | /* | |
| 33 | @@ -48,6 +48,10 @@ static int plantronics_input_mapping(str | |
| 34 | unsigned short mapped_key; | |
| 35 | unsigned long plt_type = (unsigned long)hid_get_drvdata(hdev); | |
| 36 | ||
| 37 | + /* special case for PTT products */ | |
| 38 | + if (field->application == HID_GD_JOYSTICK) | |
| 39 | + goto defaulted; | |
| 40 | + | |
| 41 | /* handle volume up/down mapping */ | |
| 42 | /* non-standard types or multi-HID interfaces - plt_type is PID */ | |
| 43 | if (!(plt_type & HID_USAGE_PAGE)) { |