HID: fixup the conflicting keyboard mappings quirk
authorJiri Kosina <jkosina@suse.cz>
Tue, 6 Jan 2015 21:34:19 +0000 (22:34 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 6 Jan 2015 21:40:13 +0000 (22:40 +0100)
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.

Cc: <stable@vger.kernel.org>
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>
drivers/hid/hid-input.c

index 84b6899..a758900 100644 (file)
@@ -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;