diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /drivers/input/evdev.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 0727b0a12557..99562cee827e 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -853,6 +853,9 @@ static void evdev_cleanup(struct evdev *evdev) | |||
| 853 | evdev_hangup(evdev); | 853 | evdev_hangup(evdev); |
| 854 | evdev_remove_chrdev(evdev); | 854 | evdev_remove_chrdev(evdev); |
| 855 | 855 | ||
| 856 | if (evdev->grab) | ||
| 857 | evdev_ungrab(evdev, evdev->grab); | ||
| 858 | |||
| 856 | /* evdev is marked dead so no one else accesses evdev->open */ | 859 | /* evdev is marked dead so no one else accesses evdev->open */ |
| 857 | if (evdev->open) { | 860 | if (evdev->open) { |
| 858 | input_flush_device(handle, NULL); | 861 | input_flush_device(handle, NULL); |