---

yaml --- r: 102000 b: refs/heads/master c: cc7e516 h: refs/heads/master v: v3
git-mirror · Jul 16, 2008 · 17858f2 · 17858f2
1 parent a793162
commit 17858f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -917,6 +917,9 @@ static int __init dock_init(void)
 
 	dock_station = NULL;
 
+	if (acpi_disabled)
+		return 0;
+
 	if (acpi_disabled)
 		return 0;