Minor edge case handling (also from upstream).

diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c
index 13d44881f9ddc99e1448ea5e06cb03ad95ee93dc..bff349d2bbe81617609dc8c7b6999e3d88ac0642 100644 (file)
--- a/drivers/acpi/wmi.c
+++ b/drivers/acpi/wmi.c
@@ -537,11 +537,11 @@ static int __init acpi_wmi_init(void)
 {
        acpi_status result;
 
-       if (acpi_disabled)
-               return -ENODEV;
-
        INIT_LIST_HEAD(&wmi_blocks.list);
 
+        if (acpi_disabled)
+                return -ENODEV;
+
        result = acpi_bus_register_driver(&acpi_wmi_driver);
 
        if (result < 0) {