diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-27 15:48:45 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-27 15:48:45 -0700 |
| commit | 1e90e2628cec11c080db3260833f515cc32fc27c (patch) | |
| tree | a50cb16a2046266e39a60bc554782e667edd31c4 /drivers/input/input.c | |
| parent | b26ff9137183309c18cdfe931e1cafcf3c1a980d (diff) | |
| parent | 5f76955ab1e43e5795a9631b22ca4f918a0ae986 (diff) | |
| download | cachepc-linux-1e90e2628cec11c080db3260833f515cc32fc27c.tar.gz cachepc-linux-1e90e2628cec11c080db3260833f515cc32fc27c.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.19 merge window.
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index e5a668ce884d..1365c9dfb5f2 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1793,8 +1793,6 @@ EXPORT_SYMBOL(input_reset_device); static int input_inhibit_device(struct input_dev *dev) { - int ret = 0; - mutex_lock(&dev->mutex); if (dev->inhibited) @@ -1816,7 +1814,7 @@ static int input_inhibit_device(struct input_dev *dev) out: mutex_unlock(&dev->mutex); - return ret; + return 0; } static int input_uninhibit_device(struct input_dev *dev) |