summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-06-24 22:57:12 -0400
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 23:27:02 +0200
commitcc7e51666d82aedfd6b9a033ca1a10d71c21f1ca (patch)
treec798c7d319bea479120c7d2fd73eb0a2a6ba0dc1 /drivers/acpi/dock.c
parentd1857056904d5f313f11184fcfa624652ff9620a (diff)
downloadlinux-cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.tar.bz2
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>
Diffstat (limited to 'drivers/acpi/dock.c')
-rw-r--r--drivers/acpi/dock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index bb7c51f712bd..1e872e79db33 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -920,6 +920,9 @@ static int __init dock_init(void)
if (acpi_disabled)
return 0;
+ 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);