Vendor import of the Intel ACPI CA 200200404 drop.

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/contrib/dev/acpica/nssearch.c b/sys/contrib/dev/acpica/nssearch.c
index fb01c7800fae..52f59b5b8404 100644
--- a/sys/contrib/dev/acpica/nssearch.c
+++ b/sys/contrib/dev/acpica/nssearch.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nssearch - Namespace search
- *              $Revision: 83 $
+ *              $Revision: 84 $
  *
  ******************************************************************************/
 
@@ -190,7 +190,7 @@ AcpiNsSearchNode (
     {
         /* Check for match against the name */
 
-        if (NextNode->Name == TargetName)
+        if (NextNode->Name.Integer == TargetName)
         {
             /*
              * Found matching entry.  Capture the type if appropriate, before
@@ -245,8 +245,8 @@ AcpiNsSearchNode (
 
     /* Searched entire table, not found */
 
-    ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Name %4.4s (type %X) not found at %p\n",
-        (char *) &TargetName, Type, NextNode));
+    ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Name %4.4s Type [%s] not found at %p\n",
+        (char *) &TargetName, AcpiUtGetTypeName (Type), NextNode));
 
     return_ACPI_STATUS (AE_NOT_FOUND);
 }
@@ -308,8 +308,8 @@ AcpiNsSearchParentTree (
 
         if (AcpiNsLocal (Type))
         {
-            ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] type %X is local(no search)\n",
-                (char *) &TargetName, Type));
+            ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "[%4.4s] type [%s] must be local to this scope (no parent search)\n",
+                (char *) &TargetName, AcpiUtGetTypeName (Type)));
         }
 
         return_ACPI_STATUS (AE_NOT_FOUND);