---

yaml --- r: 98466 b: refs/heads/master c: 816c2ed h: refs/heads/master v: v3
git-mirror · Jun 26, 2008 · b55bc77 · b55bc77
1 parent e4ed3d7
commit b55bc77
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: 4389ed2ff61de2b1485b31bf342da913dd342f59
+refs/heads/master: 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0
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;
+
 	/* look for dockable drive bays */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 		ACPI_UINT32_MAX, find_bay, &bays, NULL);

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;
+
 	/* look for a dock station */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 			    ACPI_UINT32_MAX, find_dock, &num, NULL);