| Message ID | 20090731213744.29930.45532.stgit@bob.kio (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index afd10b5..b97b2ad 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1606,10 +1606,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);
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> --- drivers/acpi/scan.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html