diff options
| author | Michał Kępień | 2017-03-09 13:11:37 +0100 |
|---|---|---|
| committer | Darren Hart | 2017-03-15 06:58:02 +0100 |
| commit | cd1aaef0b2846cead3662d37d82384660a7bbd63 (patch) | |
| tree | c8a962448c0e76ba298b7d068460a8168be442bb /drivers/platform/x86/acer-wmi.c | |
| parent | Merge branch 'ib/4.10-sparse-keymap-managed' of git://git.kernel.org/pub/scm/... (diff) | |
| download | kernel-qcow2-linux-cd1aaef0b2846cead3662d37d82384660a7bbd63.tar.gz kernel-qcow2-linux-cd1aaef0b2846cead3662d37d82384660a7bbd63.tar.xz kernel-qcow2-linux-cd1aaef0b2846cead3662d37d82384660a7bbd63.zip | |
platform/x86: acer-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/acer-wmi.c')
| -rw-r--r-- | drivers/platform/x86/acer-wmi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index dac0fbe87460..8a27f0be1aec 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -1987,7 +1987,7 @@ static int __init acer_wmi_input_setup(void) acer_wmi_notify, NULL); if (ACPI_FAILURE(status)) { err = -EIO; - goto err_free_keymap; + goto err_free_dev; } err = input_register_device(acer_wmi_input_dev); @@ -1998,8 +1998,6 @@ static int __init acer_wmi_input_setup(void) err_uninstall_notifier: wmi_remove_notify_handler(ACERWMID_EVENT_GUID); -err_free_keymap: - sparse_keymap_free(acer_wmi_input_dev); err_free_dev: input_free_device(acer_wmi_input_dev); return err; @@ -2008,7 +2006,6 @@ err_free_dev: static void acer_wmi_input_destroy(void) { wmi_remove_notify_handler(ACERWMID_EVENT_GUID); - sparse_keymap_free(acer_wmi_input_dev); input_unregister_device(acer_wmi_input_dev); } |