diff options
author | Len Brown <len.brown@intel.com> | 2008-06-24 22:57:12 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-06-26 01:55:27 -0400 |
commit | 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 (patch) | |
tree | fdd957a51fc66dba5d41d80f7d552927f627cff1 /drivers/acpi/bay.c | |
parent | 4389ed2ff61de2b1485b31bf342da913dd342f59 (diff) |
dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bay.c')
-rw-r--r-- | drivers/acpi/bay.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index 26038c2a2a71..61b6c5beb2d3 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c | |||
@@ -377,6 +377,9 @@ static int __init bay_init(void) | |||
377 | 377 | ||
378 | INIT_LIST_HEAD(&drive_bays); | 378 | INIT_LIST_HEAD(&drive_bays); |
379 | 379 | ||
380 | if (acpi_disabled) | ||
381 | return -ENODEV; | ||
382 | |||
380 | /* look for dockable drive bays */ | 383 | /* look for dockable drive bays */ |
381 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 384 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |
382 | ACPI_UINT32_MAX, find_bay, &bays, NULL); | 385 | ACPI_UINT32_MAX, find_bay, &bays, NULL); |