diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 09:26:29 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-06-22 09:26:29 -0700 |
| commit | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (patch) | |
| tree | 650c1748df35728e2bce1b8c26c064bfea272f63 /drivers/input/evdev.c | |
| parent | 469d7d22cea146e40efe8c330e5164b4d8f13934 (diff) | |
| parent | 84c88ef9affb34f10cb5b66b07e2d496845d1c28 (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.2 merge window.
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index a18f41b89b6a..9d35499faca4 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -422,10 +422,7 @@ static int evdev_release(struct inode *inode, struct file *file) evdev_detach_client(evdev, client); - if (is_vmalloc_addr(client)) - vfree(client); - else - kfree(client); + kvfree(client); evdev_close_device(evdev); |