lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hp-wmi: return -ENODEV if BIOS does not export any supported hp wmi guid

Browse Source 
Signed-off-by: Thomas Renninger <trenn@suse.de>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Thomas Renninger
2010-07-20 15:19:29 -07:00
committed by Matthew Garrett
parent ae42f23447
commit b096667bc3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,8 +711,10 @@ static int hp_wmi_resume_handler(struct device *device)
static int __init hp_wmi_init(void) static int __init hp_wmi_init(void)
{ {
int err; int err;
int event_capable = wmi_has_guid(HPWMI_EVENT_GUID);
int bios_capable = wmi_has_guid(HPWMI_BIOS_GUID);
if (wmi_has_guid(HPWMI_EVENT_GUID)) { if (event_capable) {
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_FAILURE(err)) if (ACPI_FAILURE(err))
@@ -724,7 +726,7 @@ static int __init hp_wmi_init(void)
} }
} }
if (wmi_has_guid(HPWMI_BIOS_GUID)) { if (bios_capable) {
err = platform_driver_register(&hp_wmi_driver); err = platform_driver_register(&hp_wmi_driver);
if (err) if (err)
goto err_driver_reg; goto err_driver_reg;
@@ -738,6 +740,9 @@ static int __init hp_wmi_init(void)
goto err_device_add; goto err_device_add;
} }
if (!bios_capable && !event_capable)
return -ENODEV;
return 0; return 0;
err_device_add: err_device_add: