diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 18:46:14 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 18:46:14 +0100 |
| commit | 0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch) | |
| tree | 1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /drivers/input/evdev.c | |
| parent | Input: evdev - flush pending events on clock type change (diff) | |
| parent | linux 3.19-rc4 (diff) | |
| download | linux-0c49cd295d42d0032af11d55e2140dbec11dc8d0.tar.xz linux-0c49cd295d42d0032af11d55e2140dbec11dc8d0.zip | |
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 8d4c6ca781ff..e7cee3880b75 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -460,7 +460,7 @@ static int evdev_open(struct inode *inode, struct file *file) err_free_client: evdev_detach_client(evdev, client); - kfree(client); + kvfree(client); return error; } |