Vendor import of the Intel ACPI CA 200200404 drop.

1 files changed, 9 insertions, 9 deletions

diff --git a/sys/contrib/dev/acpica/dsmthdat.c b/sys/contrib/dev/acpica/dsmthdat.c
index 3f8d3c2..d55ed30 100644
--- a/sys/contrib/dev/acpica/dsmthdat.c
+++ b/sys/contrib/dev/acpica/dsmthdat.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dsmthdat - control method arguments and local variables
- *              $Revision: 58 $
+ *              $Revision: 59 $
  *
  ******************************************************************************/
 
@@ -165,10 +165,10 @@ AcpiDsMethodDataInit (
     {
         ACPI_MOVE_UNALIGNED32_TO_32 (&WalkState->Arguments[i].Name,
                                 NAMEOF_ARG_NTE);
-        WalkState->Arguments[i].Name      |= (i << 24);
-        WalkState->Arguments[i].Descriptor = ACPI_DESC_TYPE_NAMED;
-        WalkState->Arguments[i].Type       = ACPI_TYPE_ANY;
-        WalkState->Arguments[i].Flags      = ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_ARG;
+        WalkState->Arguments[i].Name.Integer |= (i << 24);
+        WalkState->Arguments[i].Descriptor    = ACPI_DESC_TYPE_NAMED;
+        WalkState->Arguments[i].Type          = ACPI_TYPE_ANY;
+        WalkState->Arguments[i].Flags         = ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_ARG;
     }
 
     /* Init the method locals */
@@ -178,10 +178,10 @@ AcpiDsMethodDataInit (
         ACPI_MOVE_UNALIGNED32_TO_32 (&WalkState->LocalVariables[i].Name,
                                 NAMEOF_LOCAL_NTE);
 
-        WalkState->LocalVariables[i].Name      |= (i << 24);
-        WalkState->LocalVariables[i].Descriptor = ACPI_DESC_TYPE_NAMED;
-        WalkState->LocalVariables[i].Type       = ACPI_TYPE_ANY;
-        WalkState->LocalVariables[i].Flags      = ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_LOCAL;
+        WalkState->LocalVariables[i].Name.Integer |= (i << 24);
+        WalkState->LocalVariables[i].Descriptor    = ACPI_DESC_TYPE_NAMED;
+        WalkState->LocalVariables[i].Type          = ACPI_TYPE_ANY;
+        WalkState->LocalVariables[i].Flags         = ANOBJ_END_OF_PEER_LIST | ANOBJ_METHOD_LOCAL;
     }
 
     return_ACPI_STATUS (AE_OK);