aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-21 19:29:45 +0000
committerLen Brown <len.brown@intel.com>2009-09-25 14:24:29 -0400
commitadc08e2035f1859d4b129f42b2c2305ef090d226 (patch)
tree7e7ec54b01636528f105f18dc1d9336811c92afc /drivers/acpi/scan.c
parent8e029bf0a611ea3995bd1fae0285cbaf6eed7f16 (diff)
downloadlinux-linaro-android-adc08e2035f1859d4b129f42b2c2305ef090d226.tar.gz
ACPI: enumerate namespace before adding functional fixed hardware devices
This patch changes the order so we enumerate in the "root, namespace, functional fixed" order instead of the "root, functional fixed, namespace" order. When I change acpi_bus_scan() to use acpi_walk_namespace(), it will use the former order, so this patch isolates the order change for bisectability. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 4fe73596c5d..27d2dec55c6 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1650,10 +1650,10 @@ int __init acpi_scan_init(void)
/*
* Enumerate devices in the ACPI namespace.
*/
- result = acpi_bus_scan_fixed();
+ result = acpi_bus_scan(acpi_root->handle, &ops);
if (!result)
- result = acpi_bus_scan(acpi_root->handle, &ops);
+ result = acpi_bus_scan_fixed();
if (result)
acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);