diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-20 04:54:54 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-20 04:54:54 -0500 |
| commit | 93b8eef1c098efbea2f1fc0be7e3c681f259a7e7 (patch) | |
| tree | 462cc8c2bc07bbc825dab2a200891a28d8643329 /drivers/input/joydev.c | |
| parent | a2d781fc8d9b16113dd9440107d73c0f21d7cbef (diff) | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
Merge commit 'v2.6.28-rc9' into next
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 f9b876bd378d..6f2366220a50 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 | ||