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 23:27:02 +0200 |
| commit | cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca (patch) | |
| tree | c798c7d319bea479120c7d2fd73eb0a2a6ba0dc1 /drivers/acpi | |
| parent | d1857056904d5f313f11184fcfa624652ff9620a (diff) | |
| download | kernel_samsung_tuna-cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.zip kernel_samsung_tuna-cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca.tar.gz kernel_samsung_tuna-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')
| -rw-r--r-- | drivers/acpi/bay.c | 3 | ||||
| -rw-r--r-- | drivers/acpi/dock.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index 61b6c5b..e6caf5d 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); diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index bb7c51f..1e872e7 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); |