diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-15 05:14:29 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-03-15 05:14:29 +0300 |
| commit | ce8356335027d3929fbfae4127451adaf36e1cd4 (patch) | |
| tree | 8ac7d71d3b67a6138e811cd4d4e135d934233e47 /drivers/input/input.c | |
| parent | 5fb3fb8aa22ff6e6da4018fd3ab3e30e2fdc5e53 (diff) | |
| parent | 09688c0166e76ce2fb85e86b9d99be8b0084cdf9 (diff) | |
| download | linux-ce8356335027d3929fbfae4127451adaf36e1cd4.tar.xz | |
Merge tag 'v5.17-rc8' into next
Sync up with mainline to again get the latest changes in HID subsystem.
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 4456e82d370b..7c7e4042ec10 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -2318,6 +2318,12 @@ int input_register_device(struct input_dev *dev) /* KEY_RESERVED is not supposed to be transmitted to userspace. */ __clear_bit(KEY_RESERVED, dev->keybit); + /* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ + if (test_bit(INPUT_PROP_BUTTONPAD, dev->propbit)) { + __clear_bit(BTN_RIGHT, dev->keybit); + __clear_bit(BTN_MIDDLE, dev->keybit); + } + /* Make sure that bitmasks not mentioned in dev->evbit are clean. */ input_cleanse_bitmasks(dev); |