From 17858f20618c05951524f4c7c4d0d0a068b0d409 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Tue, 24 Jun 2008 22:57:12 -0400
Subject: [PATCH] --- yaml --- r: 102000 b: refs/heads/master c:
 cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/bay.c  | 3 +++
 trunk/drivers/acpi/dock.c | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0855bbe23c8b..d13ef4a268e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1857056904d5f313f11184fcfa624652ff9620a
+refs/heads/master: cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca
diff --git a/trunk/drivers/acpi/bay.c b/trunk/drivers/acpi/bay.c
index 61b6c5beb2d3..e6caf5d42e0e 100644
--- a/trunk/drivers/acpi/bay.c
+++ b/trunk/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/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c
index bb7c51f712bd..1e872e79db33 100644
--- a/trunk/drivers/acpi/dock.c
+++ b/trunk/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;