Commit 96b5a46e authored by Linus Torvalds's avatar Linus Torvalds

WMI: initialize wmi_blocks.list even if ACPI is disabled

Even if we don't want to register the WMI driver, we should initialize
the wmi_blocks list to be empty, since we don't want the wmi helper
functions to oops just because that basic list has not even been set up.

With this, "find_guid()" will happily return "not found" rather than
oopsing all over the place, and the callers will then just automatically
return false or AE_NOT_FOUND as appropriate.
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2c158269
...@@ -673,11 +673,11 @@ static int __init acpi_wmi_init(void) ...@@ -673,11 +673,11 @@ static int __init acpi_wmi_init(void)
{ {
acpi_status result; acpi_status result;
INIT_LIST_HEAD(&wmi_blocks.list);
if (acpi_disabled) if (acpi_disabled)
return -ENODEV; return -ENODEV;
INIT_LIST_HEAD(&wmi_blocks.list);
result = acpi_bus_register_driver(&acpi_wmi_driver); result = acpi_bus_register_driver(&acpi_wmi_driver);
if (result < 0) { if (result < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment