From: Björn Steinbrink Date: Sun, 30 Mar 2008 18:42:59 +0000 (+0200) Subject: evdev: Release eventual input device grabs when getting disconnected X-Git-Tag: v2.6.25-rc8~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eb08b6b973cb91311431c6eea3cc232b97152a84;p=linux-2.6-omap-h63xx.git evdev: Release eventual input device grabs when getting disconnected When getting disconnected we need to release eventual grabs on the underlying input device as we also release the input device itself. Otherwise, we would try to release the grab when the client that requested it closes its handle, accessing the input device which might already be freed. Signed-off-by: Björn Steinbrink Signed-off-by: Linus Torvalds --- diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 0727b0a1255..99562cee827 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -853,6 +853,9 @@ static void evdev_cleanup(struct evdev *evdev) evdev_hangup(evdev); evdev_remove_chrdev(evdev); + if (evdev->grab) + evdev_ungrab(evdev, evdev->grab); + /* evdev is marked dead so no one else accesses evdev->open */ if (evdev->open) { input_flush_device(handle, NULL);