diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:26:18 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:26:18 +0300 |
| commit | d06e56c6aaa5d9161fffee22f7104b248cc96e3c (patch) | |
| tree | e06ffdf626ecff8f179fc245e06050fe224ac1de /drivers/hid | |
| parent | 25721aefe1d0b0d604d66fb5912fb383ce56c6ac (diff) | |
| parent | 37e376df5f4993677c33968a0c19b0c5acbf1108 (diff) | |
| download | linux-d06e56c6aaa5d9161fffee22f7104b248cc96e3c.tar.xz | |
Merge branch 'for-4.18/plantronics' into for-linus
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-plantronics.c | 6 |
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 @@ * 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)) { |