diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-07-17 09:20:46 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-07-17 09:20:46 -0700 |
| commit | 50501936288d6a29d7ef78f25d00e33240fad45f (patch) | |
| tree | ad5fe10a0eaa868c35cc52682fd2b4a0ebb4ccec /drivers/input/input.c | |
| parent | 677232f879f2464007c511a73048ff5996b479fc (diff) | |
| parent | 6995e2de6891c724bfeb2db33d7b87775f913ad1 (diff) | |
| download | linux-50501936288d6a29d7ef78f25d00e33240fad45f.tar.gz linux-50501936288d6a29d7ef78f25d00e33240fad45f.tar.bz2 linux-50501936288d6a29d7ef78f25d00e33240fad45f.zip | |
Merge tag 'v6.4' into next
Sync up with mainline to bring in updates to shared infrastructure.
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index f791d14ecf23..8c5fdb0f858a 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -705,7 +705,7 @@ void input_close_device(struct input_handle *handle) __input_release_device(handle); - if (!dev->inhibited && !--dev->users) { + if (!--dev->users && !dev->inhibited) { if (dev->poller) input_dev_poller_stop(dev->poller); if (dev->close) |