UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform/x86: msi-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>
This commit is contained in:
Michał Kępień 2017-03-09 13:11:46 +01:00 committed by Darren Hart
parent 7cb8aa8caf
commit 0788e3375a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/platform/x86/msi-wmi.c
View File

@ -281,14 +281,12 @@ static int __init msi_wmi_input_setup(void)
err = input_register_device(msi_wmi_input_dev); err = input_register_device(msi_wmi_input_dev);
if (err) if (err)
goto err_free_keymap; goto err_free_dev;
last_pressed = 0; last_pressed = 0;
return 0; return 0;
err_free_keymap:
sparse_keymap_free(msi_wmi_input_dev);
err_free_dev: err_free_dev:
input_free_device(msi_wmi_input_dev); input_free_device(msi_wmi_input_dev);
return err; return err;
@ -342,10 +340,8 @@ err_uninstall_handler:
if (event_wmi) if (event_wmi)
wmi_remove_notify_handler(event_wmi->guid); wmi_remove_notify_handler(event_wmi->guid);
err_free_input: err_free_input:
if (event_wmi) { if (event_wmi)
sparse_keymap_free(msi_wmi_input_dev);
input_unregister_device(msi_wmi_input_dev); input_unregister_device(msi_wmi_input_dev);
}
return err; return err;
} }
@ -353,7 +349,6 @@ static void __exit msi_wmi_exit(void)
{ {
if (event_wmi) { if (event_wmi) {
wmi_remove_notify_handler(event_wmi->guid); wmi_remove_notify_handler(event_wmi->guid);
sparse_keymap_free(msi_wmi_input_dev);
input_unregister_device(msi_wmi_input_dev); input_unregister_device(msi_wmi_input_dev);
} }
backlight_device_unregister(backlight); backlight_device_unregister(backlight);