diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-28 13:39:17 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-28 13:39:17 +0530 |
| commit | 8197cb15eaf0640d13c816926f65972ca6cbba84 (patch) | |
| tree | 17b034f1f03a3d1b7776001cb63bdfd186415130 /drivers/input/evdev.c | |
| parent | 7cc7de288765bc634a0374e660de01a3fd4e8e39 (diff) | |
| parent | 22b3c9ca22924cf7015ecadf7ce111cf402a707b (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra2_dvfs.c
Change-Id: I3853d668107c191c94f731256a8d0b63149e8279
Diffstat (limited to 'drivers/input/evdev.c')
| -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); |