Skip to content

Commit

Permalink
HID: fixup the conflicting keyboard mappings quirk
Browse files Browse the repository at this point in the history
The ignore check that got added in 6ce901e ("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.

Cc: <[email protected]>
Fixes: 6ce901e ("HID: input: fix confusion on conflicting mappings")
Reported-by: Fredrik Hallenberg <[email protected]>
Reported-by: David Herrmann <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
  • Loading branch information
Jiri Kosina committed Jan 6, 2015
1 parent 79bc33b commit 8e7b341
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/hid/hid-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,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;
Expand Down

0 comments on commit 8e7b341

Please sign in to comment.