diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-01-06 22:34:19 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-03-16 14:58:18 +0100 |
| commit | 365302800a2667d7a1a1ed54bc691e65c6b8e4b9 (patch) | |
| tree | 67a02ad0578ccea017c3adc160ade369fea1036f /drivers/hid/hid-input.c | |
| parent | 955c3838cacf128fa7ca929f9c58df74778f6150 (diff) | |
HID: fixup the conflicting keyboard mappings quirk
commit 8e7b341037db1835ee6eea64663013cbfcf33575 upstream.
The ignore check that got added in 6ce901eb61 ("HID: input: fix confusion
on conflicting mappings") needs to properly check for VARIABLE reports
as well (ARRAY reports should be ignored), otherwise legitimate keyboards
might break.
Fixes: 6ce901eb61 ("HID: input: fix confusion on conflicting mappings")
Reported-by: Fredrik Hallenberg <megahallon@gmail.com>
Reported-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index a70e999209d9..9dcccbde65fb 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1081,6 +1081,7 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct */ if (!(field->flags & (HID_MAIN_ITEM_RELATIVE | HID_MAIN_ITEM_BUFFERED_BYTE)) && + (field->flags & HID_MAIN_ITEM_VARIABLE) && usage->usage_index < field->maxusage && value == field->value[usage->usage_index]) return; |