From: Kamala Narasimhan <kamala.narasimhan@citrix.com>
Date: Mon, 23 Feb 2009 21:30:58 +0000 (-0500)
Subject: Minor edge case handling (also from upstream).
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=de3bdaca63442a7f22c560ab97acb1897494d060;p=xenclient%2Fkernel.git

Minor edge case handling (also from upstream).
---

diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c
index 13d44881..bff349d2 100644
--- 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) {