raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-24 02:52:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Prepare input updates for 5.19 merge window.
This commit is contained in:
Dmitry Torokhov
2022-05-27 15:48:45 -07:00
parent b26ff91371 5f76955ab1
commit 1e90e2628c
94 changed files with 4171 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/input.c
View File

@@ -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)