Skip to content

Commit 8e7b341

Browse files
author
Jiri Kosina
committed
HID: fixup the conflicting keyboard mappings quirk
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: <stable@vger.kernel.org> Fixes: 6ce901e ("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>
1 parent 79bc33b commit 8e7b341

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/hid/hid-input.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,7 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
11131113
*/
11141114
if (!(field->flags & (HID_MAIN_ITEM_RELATIVE |
11151115
HID_MAIN_ITEM_BUFFERED_BYTE)) &&
1116+
(field->flags & HID_MAIN_ITEM_VARIABLE) &&
11161117
usage->usage_index < field->maxusage &&
11171118
value == field->value[usage->usage_index])
11181119
return;

0 commit comments

Comments
 (0)