dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
authorLen Brown <len.brown@intel.com>
Wed, 25 Jun 2008 02:57:12 +0000 (22:57 -0400)
committerAndi Kleen <andi@basil.nowhere.org>
Wed, 16 Jul 2008 21:27:02 +0000 (23:27 +0200)
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/acpi/bay.c
drivers/acpi/dock.c

index 61b6c5beb2d347d32d1fe1e3ee1ff8195e5f731d..e6caf5d42e0eb72a7f49a9b44fa00c290937dbcf 100644 (file)
@@ -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;
 
index bb7c51f712bd6cde630e4e8e5a771ca9d9e5fc55..1e872e79db33bdeaf35cdf4fd049afc0e31acd14 100644 (file)
@@ -917,6 +917,9 @@ static int __init dock_init(void)
 
        dock_station = NULL;
 
+       if (acpi_disabled)
+               return 0;
+
        if (acpi_disabled)
                return 0;