diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /drivers/input/evdev.c | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 3524bef62be6..1070db330d35 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -235,7 +235,6 @@ static int evdev_release(struct inode *inode, struct file *file) | |||
| 235 | evdev_ungrab(evdev, client); | 235 | evdev_ungrab(evdev, client); |
| 236 | mutex_unlock(&evdev->mutex); | 236 | mutex_unlock(&evdev->mutex); |
| 237 | 237 | ||
| 238 | evdev_fasync(-1, file, 0); | ||
| 239 | evdev_detach_client(evdev, client); | 238 | evdev_detach_client(evdev, client); |
| 240 | kfree(client); | 239 | kfree(client); |
| 241 | 240 | ||