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 | |
| parent | 4389ed2ff61de2b1485b31bf342da913dd342f59 (diff) | |
| download | talos-op-linux-816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0.tar.gz talos-op-linux-816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0.zip | |
dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
Signed-off-by: Len Brown <len.brown@intel.com>
| -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 26038c2a2a71..61b6c5beb2d3 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c @@ -377,6 +377,9 @@ static int __init bay_init(void) INIT_LIST_HEAD(&drive_bays); + 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 96c542f7fded..bb7c51f712bd 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -917,6 +917,9 @@ static int __init dock_init(void) dock_station = NULL; + 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); |
