From: Bjorn Helgaas Date: Mon, 21 Sep 2009 19:29:45 +0000 (+0000) Subject: ACPI: enumerate namespace before adding functional fixed hardware devices X-Git-Tag: v2.6.32-rc1~18^2~2^2~13 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=adc08e2035f1859d4b129f42b2c2305ef090d226;p=~shefty%2Frdma-dev.git 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 Signed-off-by: Len Brown --- 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);