diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/input/evdev.c | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
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 | ||