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/joydev.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/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 65d7077a75a1..a85b1485e774 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
| @@ -244,7 +244,6 @@ static int joydev_release(struct inode *inode, struct file *file) | |||
| 244 | struct joydev_client *client = file->private_data; | 244 | struct joydev_client *client = file->private_data; |
| 245 | struct joydev *joydev = client->joydev; | 245 | struct joydev *joydev = client->joydev; |
| 246 | 246 | ||
| 247 | joydev_fasync(-1, file, 0); | ||
| 248 | joydev_detach_client(joydev, client); | 247 | joydev_detach_client(joydev, client); |
| 249 | kfree(client); | 248 | kfree(client); |
| 250 | 249 | ||