From: Linus Torvalds Date: Tue, 12 Feb 2008 04:52:01 +0000 (-0800) Subject: WMI: initialize wmi_blocks.list even if ACPI is disabled X-Git-Tag: v2.6.25-rc2~79 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=96b5a46e2a72dc1829370c87053e0cd558d58bc0;p=linux-2.6-omap-h63xx.git 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: Linus Torvalds --- diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c index 36b84ab418d..457ed3d3f51 100644 --- a/drivers/acpi/wmi.c +++ b/drivers/acpi/wmi.c @@ -673,11 +673,11 @@ static int __init acpi_wmi_init(void) { acpi_status result; + INIT_LIST_HEAD(&wmi_blocks.list); + if (acpi_disabled) return -ENODEV; - INIT_LIST_HEAD(&wmi_blocks.list); - result = acpi_bus_register_driver(&acpi_wmi_driver); if (result < 0) {