diff options
| author | Len Brown <len.brown@intel.com> | 2008-06-24 22:57:12 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2008-07-16 17:27:02 -0400 |
| commit | cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca (patch) | |
| tree | c798c7d319bea479120c7d2fd73eb0a2a6ba0dc1 /drivers/acpi/bay.c | |
| parent | d1857056904d5f313f11184fcfa624652ff9620a (diff) | |
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.c | 3 |
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) | |||
| 380 | if (acpi_disabled) | 380 | if (acpi_disabled) |
| 381 | return -ENODEV; | 381 | return -ENODEV; |
| 382 | 382 | ||
| 383 | if (acpi_disabled) | ||
| 384 | return -ENODEV; | ||
| 385 | |||
| 383 | /* look for dockable drive bays */ | 386 | /* look for dockable drive bays */ |
| 384 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 387 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |
| 385 | ACPI_UINT32_MAX, find_bay, &bays, NULL); | 388 | ACPI_UINT32_MAX, find_bay, &bays, NULL); |