summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bay.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-06-25 04:57:12 +0200
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 23:27:02 +0200
commitcc7e51666d82aedfd6b9a033ca1a10d71c21f1ca (patch)
treec798c7d319bea479120c7d2fd73eb0a2a6ba0dc1 /drivers/acpi/bay.c
parentACPI: don't walk tables if ACPI was disabled (diff)
downloadlinux-cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.tar.xz
linux-cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.zip
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/bay.c')
-rw-r--r--drivers/acpi/bay.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 61b6c5beb2d3..e6caf5d42e0e 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -380,6 +380,9 @@ static int __init bay_init(void)
if (acpi_disabled)
return -ENODEV;
+ 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);