summaryrefslogtreecommitdiff
path: root/drivers/input/misc/wistron_btns.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-03-08 20:27:27 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-03-09 21:06:12 +0300
commitfc2a6e5048c6812253590b8ae26eed3236b25eac (patch)
treee76b83dfba2e384da07c9505a7c389fef960179f /drivers/input/misc/wistron_btns.c
parenta227954756de74d8e70d70135e405d69dea4e3fe (diff)
downloadlinux-fc2a6e5048c6812253590b8ae26eed3236b25eac.tar.xz
Input: wistron_btns - remove use of sparse_keymap_free
Now that sparse keymap uses managed memory, we no longer need to clean it up manually. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc/wistron_btns.c')
-rw-r--r--drivers/input/misc/wistron_btns.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index e25f87ba19f6..43e67f546366 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -1243,12 +1243,10 @@ static int setup_input_dev(void)
error = input_register_polled_device(wistron_idev);
if (error)
- goto err_free_keymap;
+ goto err_free_dev;
return 0;
- err_free_keymap:
- sparse_keymap_free(input_dev);
err_free_dev:
input_free_polled_device(wistron_idev);
return error;
@@ -1300,7 +1298,6 @@ static int wistron_remove(struct platform_device *dev)
{
wistron_led_remove();
input_unregister_polled_device(wistron_idev);
- sparse_keymap_free(wistron_idev->input);
input_free_polled_device(wistron_idev);
bios_detach();