Skip to content

Commit

Permalink
hp-wmi: return -ENODEV if BIOS does not export any supported hp wmi guid
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Renninger authored and Matthew Garrett committed Aug 3, 2010
1 parent ae42f23 commit b096667
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/platform/x86/hp-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,10 @@ static int hp_wmi_resume_handler(struct device *device)
static int __init hp_wmi_init(void)
{
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,
hp_wmi_notify, NULL);
if (ACPI_FAILURE(err))
Expand All @@ -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);
if (err)
goto err_driver_reg;
Expand All @@ -738,6 +740,9 @@ static int __init hp_wmi_init(void)
goto err_device_add;
}

if (!bios_capable && !event_capable)
return -ENODEV;

return 0;

err_device_add:
Expand Down

0 comments on commit b096667

Please sign in to comment.