diff options
| author | Simon Wood <simon@mungewell.org> | 2015-11-19 16:42:14 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-11-20 10:30:00 +0100 |
| commit | b466c1dd73d5303a313fb0c962e4eb5879bc1336 (patch) | |
| tree | 215cd253e933751e75c532e7571bc62f6d0b3900 | |
| parent | 7f4b49fef6ffb5021c01a915c21b3221fd521e81 (diff) | |
| download | linux-b466c1dd73d5303a313fb0c962e4eb5879bc1336.tar.gz linux-b466c1dd73d5303a313fb0c962e4eb5879bc1336.tar.bz2 linux-b466c1dd73d5303a313fb0c962e4eb5879bc1336.zip | |
HID: Add vendor specific usage pages for Logitech G920
The Logitech G920 uses a couple of vendor specific usage pages,
which results in incorrect number of axis/buttons being detected.
This patch adds these pages to the 'ignore' list.
Reported-by: Elias Vanderstuyft <elias.vds@gmail.com>
Signed-off-by: Simon Wood <simon@mungewell.org>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-input.c | 4 | ||||
| -rw-r--r-- | include/linux/hid.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 2ba6bf69b7d0..f4eeb6bcb9ac 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -960,6 +960,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel goto ignore; case HID_UP_LOGIVENDOR: + /* intentional fallback */ + case HID_UP_LOGIVENDOR2: + /* intentional fallback */ + case HID_UP_LOGIVENDOR3: goto ignore; case HID_UP_PID: diff --git a/include/linux/hid.h b/include/linux/hid.h index 251a1d382e23..a6d7a3fc2cb3 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -168,6 +168,8 @@ struct hid_item { #define HID_UP_MSVENDOR 0xff000000 #define HID_UP_CUSTOM 0x00ff0000 #define HID_UP_LOGIVENDOR 0xffbc0000 +#define HID_UP_LOGIVENDOR2 0xff090000 +#define HID_UP_LOGIVENDOR3 0xff430000 #define HID_UP_LNVENDOR 0xffa00000 #define HID_UP_SENSOR 0x00200000 |