diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-28 01:40:01 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-28 01:40:01 +0200 |
| commit | 690e179059e7e89040d1cd564e39761567a8d5dc (patch) | |
| tree | b6a64fc5ca4fd862e17559c46676258ae17c87d5 /drivers/input/input.c | |
| parent | Input: stmfts - do not leave device disabled in stmfts_input_open (diff) | |
| parent | Linux 5.18 (diff) | |
| download | linux-690e179059e7e89040d1cd564e39761567a8d5dc.tar.xz linux-690e179059e7e89040d1cd564e39761567a8d5dc.zip | |
Merge tag 'v5.18' into next
Sync up with mainline to get updates to OMAP4 keypad driver and other
upstream goodies.
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 0e7f3d065b09..1365c9dfb5f2 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -2335,12 +2335,6 @@ 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); |