diff options
| author | Colin Cross <ccross@android.com> | 2011-01-19 21:21:20 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-19 21:21:20 -0800 |
| commit | e6e83971d48c98393a15b48b5a66a4c2f55753fe (patch) | |
| tree | 23bd923c4c9a755d21c0f93ffcc69b06735c2c05 /drivers/input | |
| parent | 01b536d2219c6c25274d01397a09df9b218521b9 (diff) | |
| parent | f82c6e916c007e5b1c5d9fe74d7c9e5a0170f514 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/evdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 7d22f51392dd..43e94e5188dd 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -316,6 +316,7 @@ static int evdev_open(struct inode *inode, struct file *file) err_free_client: evdev_detach_client(evdev, client); + wake_lock_destroy(&client->wake_lock); kfree(client); err_put_evdev: put_device(&evdev->dev); |