From: Len Brown <len.brown@intel.com>
Date: Wed, 25 Jun 2008 02:57:12 +0000 (-0400)
Subject: dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
X-Git-Tag: v2.6.27-rc1~1050^2~64
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca;p=linux-2.6-omap-h63xx.git

dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.

Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 61b6c5beb2d..e6caf5d42e0 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -377,6 +377,9 @@ static int __init bay_init(void)
 
 	INIT_LIST_HEAD(&drive_bays);
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	if (acpi_disabled)
 		return -ENODEV;
 
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bb7c51f712b..1e872e79db3 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -917,6 +917,9 @@ static int __init dock_init(void)
 
 	dock_station = NULL;
 
+	if (acpi_disabled)
+		return 0;
+
 	if (acpi_disabled)
 		return 0;