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/dock.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/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 3 |
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) | |||
| 920 | if (acpi_disabled) | 920 | if (acpi_disabled) |
| 921 | return 0; | 921 | return 0; |
| 922 | 922 | ||
| 923 | if (acpi_disabled) | ||
| 924 | return 0; | ||
| 925 | |||
| 923 | /* look for a dock station */ | 926 | /* look for a dock station */ |
| 924 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 927 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |
| 925 | ACPI_UINT32_MAX, find_dock, &num, NULL); | 928 | ACPI_UINT32_MAX, find_dock, &num, NULL); |