diff options
| author | Michał Kępień <kernel@kempniu.pl> | 2017-03-09 13:11:43 +0100 |
|---|---|---|
| committer | Darren Hart <dvhart@infradead.org> | 2017-03-14 22:58:06 -0700 |
| commit | 3a3c1115ce55f02e6185338808a4b7959b46e334 (patch) | |
| tree | e3a9aa131136be61d7ecc0b8694beec54efd2091 /drivers/platform | |
| parent | de3c91c1ce073445e9cab5ad43fb038f896919b6 (diff) | |
| download | talos-op-linux-3a3c1115ce55f02e6185338808a4b7959b46e334.tar.gz talos-op-linux-3a3c1115ce55f02e6185338808a4b7959b46e334.zip | |
platform/x86: hp-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')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 96ffda493266..7abf92d0ba81 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -673,7 +673,7 @@ static int __init hp_wmi_input_setup(void) status = wmi_install_notify_handler(HPWMI_EVENT_GUID, hp_wmi_notify, NULL); if (ACPI_FAILURE(status)) { err = -EIO; - goto err_free_keymap; + goto err_free_dev; } err = input_register_device(hp_wmi_input_dev); @@ -684,8 +684,6 @@ static int __init hp_wmi_input_setup(void) err_uninstall_notifier: wmi_remove_notify_handler(HPWMI_EVENT_GUID); - err_free_keymap: - sparse_keymap_free(hp_wmi_input_dev); err_free_dev: input_free_device(hp_wmi_input_dev); return err; @@ -694,7 +692,6 @@ static int __init hp_wmi_input_setup(void) static void hp_wmi_input_destroy(void) { wmi_remove_notify_handler(HPWMI_EVENT_GUID); - sparse_keymap_free(hp_wmi_input_dev); input_unregister_device(hp_wmi_input_dev); } |
