diff options
| author | Michał Kępień <kernel@kempniu.pl> | 2017-03-09 13:11:49 +0100 |
|---|---|---|
| committer | Darren Hart <dvhart@infradead.org> | 2017-03-15 06:58:11 +0100 |
| commit | c6d973f474cfdc4d9f0f18b7f539c5cc7847188d (patch) | |
| tree | edc78e274ea25d819a5ddc894128d734c68fbac2 /drivers/platform/x86/toshiba-wmi.c | |
| parent | platform/x86: topstar-laptop: remove sparse_keymap_free() calls (diff) | |
| download | linux-c6d973f474cfdc4d9f0f18b7f539c5cc7847188d.tar.xz linux-c6d973f474cfdc4d9f0f18b7f539c5cc7847188d.zip | |
platform/x86: toshiba-wmi: remove sparse_keymap_free() calls
As sparse_keymap_setup() now uses a managed memory allocation for the
keymap copy it creates, the latter is freed automatically. Remove all
calls to sparse_keymap_free().
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/platform/x86/toshiba-wmi.c')
| -rw-r--r-- | drivers/platform/x86/toshiba-wmi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/platform/x86/toshiba-wmi.c b/drivers/platform/x86/toshiba-wmi.c index 2df07ee8f3c3..440528676170 100644 --- a/drivers/platform/x86/toshiba-wmi.c +++ b/drivers/platform/x86/toshiba-wmi.c @@ -96,7 +96,7 @@ static int __init toshiba_wmi_input_setup(void) toshiba_wmi_notify, NULL); if (ACPI_FAILURE(status)) { err = -EIO; - goto err_free_keymap; + goto err_free_dev; } err = input_register_device(toshiba_wmi_input_dev); @@ -107,8 +107,6 @@ static int __init toshiba_wmi_input_setup(void) err_remove_notifier: wmi_remove_notify_handler(WMI_EVENT_GUID); - err_free_keymap: - sparse_keymap_free(toshiba_wmi_input_dev); err_free_dev: input_free_device(toshiba_wmi_input_dev); return err; @@ -117,7 +115,6 @@ static int __init toshiba_wmi_input_setup(void) static void toshiba_wmi_input_destroy(void) { wmi_remove_notify_handler(WMI_EVENT_GUID); - sparse_keymap_free(toshiba_wmi_input_dev); input_unregister_device(toshiba_wmi_input_dev); } |