diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-01-06 22:34:19 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-02-24 10:01:02 +0000 |
| commit | 00b9f78e08f19e00e53bf87fba1594cd2a62f1f9 (patch) | |
| tree | f2d1cfdb82a0cc51925de5e3572eb1774eaf4559 /drivers/hid | |
| parent | a097d579eba9cc41ecb307c83feb884e6a2be869 (diff) | |
| download | linux-stable-00b9f78e08f19e00e53bf87fba1594cd2a62f1f9.tar.gz linux-stable-00b9f78e08f19e00e53bf87fba1594cd2a62f1f9.tar.bz2 linux-stable-00b9f78e08f19e00e53bf87fba1594cd2a62f1f9.zip | |
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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/hid')
| -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 323c3ba85a5d..79fa1cd9dfdd 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1110,6 +1110,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; |