*sigh* Revert stuff that wasn't supposed to be committed. The

acpi_resource change was a minor nit offered as an early candidate for
the recent ACPICA import problem and the acpi.c change is one I need to
test still that makes the ordered probing of system devices actually work
as advertised (probe devices in order based on the type of device rather
than in the order we encounter them in the device tree).

2 files changed, 3 insertions, 4 deletions

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 2823f62..bb34549 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -1497,13 +1497,13 @@ acpi_probe_order(ACPI_HANDLE handle, int *order)
     ret = 0;
     if (acpi_MatchHid(handle, "PNP0C01") || acpi_MatchHid(handle, "PNP0C02")) {
 	*order = 1;
-	ret = 0;
+	ret = 1;
     } else if (acpi_MatchHid(handle, "PNP0C09")) {
 	*order = 2;
-	ret = 0;
+	ret = 1;
     } else if (acpi_MatchHid(handle, "PNP0C0F")) {
 	*order = 3;
-	ret = 0;
+	ret = 1;
     }
 
     return (ret);
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index d671e07..cde23e2 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -168,7 +168,6 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
 
     /* Fetch the device's current resources. */
     buf.Length = ACPI_ALLOCATE_BUFFER;
-    buf.Pointer = NULL;
     if (ACPI_FAILURE((status = AcpiGetCurrentResources(handle, &buf)))) {
 	if (status != AE_NOT_FOUND)
 	    printf("can't fetch resources for %s - %s\n",