AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

hp-wmi: add error handling for hp_wmi_init

Browse Source 
Current implementation in hp_wmi_init does not check any error and always
return success.
This patch properly handles recource reclaim and return err in error path.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Axel Lin 2010-06-10 16:06:40 +08:00 committed by Matthew Garrett
parent 35f2915c3b
commit dfec5c48cd
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/platform/x86/hp-wmi.c
View File

@ -715,23 +715,42 @@ static int __init hp_wmi_init(void)
if (wmi_has_guid(HPWMI_EVENT_GUID)) { if (wmi_has_guid(HPWMI_EVENT_GUID)) {
err = wmi_install_notify_handler(HPWMI_EVENT_GUID, err = wmi_install_notify_handler(HPWMI_EVENT_GUID,
hp_wmi_notify, NULL); hp_wmi_notify, NULL);
if (ACPI_SUCCESS(err)) if (ACPI_FAILURE(err))
hp_wmi_input_setup(); return -EINVAL;
err = hp_wmi_input_setup();
if (err) {
wmi_remove_notify_handler(HPWMI_EVENT_GUID);
return err;
}
} }
if (wmi_has_guid(HPWMI_BIOS_GUID)) { if (wmi_has_guid(HPWMI_BIOS_GUID)) {
err = platform_driver_register(&hp_wmi_driver); err = platform_driver_register(&hp_wmi_driver);
if (err) if (err)
return 0; goto err_driver_reg;
hp_wmi_platform_dev = platform_device_alloc("hp-wmi", -1); hp_wmi_platform_dev = platform_device_alloc("hp-wmi", -1);
if (!hp_wmi_platform_dev) { if (!hp_wmi_platform_dev) {
platform_driver_unregister(&hp_wmi_driver); err = -ENOMEM;
return 0; goto err_device_alloc;
} }
platform_device_add(hp_wmi_platform_dev); err = platform_device_add(hp_wmi_platform_dev);
if (err)
goto err_device_add;
} }
return 0; return 0;
err_device_add:
platform_device_put(hp_wmi_platform_dev);
err_device_alloc:
platform_driver_unregister(&hp_wmi_driver);
err_driver_reg:
if (wmi_has_guid(HPWMI_EVENT_GUID)) {
input_unregister_device(hp_wmi_input_dev);
wmi_remove_notify_handler(HPWMI_EVENT_GUID);
}
return err;
} }
static void __exit hp_wmi_exit(void) static void __exit hp_wmi_exit(void)