Browse Source

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>
Len Brown 17 years ago
parent
commit
cc7e51666d
2 changed files with 6 additions and 0 deletions
  1. 3 0
      drivers/acpi/bay.c
  2. 3 0
      drivers/acpi/dock.c

+ 3 - 0
drivers/acpi/bay.c

@@ -377,6 +377,9 @@ static int __init bay_init(void)
 
 
 	INIT_LIST_HEAD(&drive_bays);
 	INIT_LIST_HEAD(&drive_bays);
 
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	if (acpi_disabled)
 	if (acpi_disabled)
 		return -ENODEV;
 		return -ENODEV;
 
 

+ 3 - 0
drivers/acpi/dock.c

@@ -917,6 +917,9 @@ static int __init dock_init(void)
 
 
 	dock_station = NULL;
 	dock_station = NULL;
 
 
+	if (acpi_disabled)
+		return 0;
+
 	if (acpi_disabled)
 	if (acpi_disabled)
 		return 0;
 		return 0;