diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 13:30:01 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-02-23 13:30:01 +0300 |
| commit | 760f7e7b959580ee06d925ad737147a36b194e83 (patch) | |
| tree | e3fa4327f2ee50ced8ad1038016dd5e8b7f9eb4f /drivers/hid/hid-input.c | |
| parent | 88f38846bfb1a452a3d47e38aeab20a4ceb74294 (diff) | |
| parent | 7c7d7ac7cebbf64a256b40ac7eb198cef8fd0642 (diff) | |
| download | linux-760f7e7b959580ee06d925ad737147a36b194e83.tar.xz | |
Merge branch 'for-5.12/core' into for-linus
- improved handling of generic HID keyboard (no more splitting system
and consumer controls away), in order to make it easier for userspace
to figure out the details of the device easier. From Dmitry Torokhov.
- report data sanitization fixes from Will McVicker and Randy Dunlap
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 8ed7f468bd95..236bccd37760 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1856,6 +1856,16 @@ static struct hid_input *hidinput_match_application(struct hid_report *report) list_for_each_entry(hidinput, &hid->inputs, list) { if (hidinput->application == report->application) return hidinput; + + /* + * Keep SystemControl and ConsumerControl applications together + * with the main keyboard, if present. + */ + if ((report->application == HID_GD_SYSTEM_CONTROL || + report->application == HID_CP_CONSUMER_CONTROL) && + hidinput->application == HID_GD_KEYBOARD) { + return hidinput; + } } return NULL; |