diff options
Diffstat (limited to 'sys/contrib/dev/acpica/exoparg3.c')
-rw-r--r-- | sys/contrib/dev/acpica/exoparg3.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sys/contrib/dev/acpica/exoparg3.c b/sys/contrib/dev/acpica/exoparg3.c index 43c5db4..5251202 100644 --- a/sys/contrib/dev/acpica/exoparg3.c +++ b/sys/contrib/dev/acpica/exoparg3.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: exoparg3 - AML execution - opcodes with 3 arguments - * $Revision: 3 $ + * $Revision: 5 $ * *****************************************************************************/ @@ -137,21 +137,20 @@ * * AcpiExOpcode_xA_yT_zR * - * Where: + * Where: * - * xA - ARGUMENTS: The number of arguments (input operands) that are + * xA - ARGUMENTS: The number of arguments (input operands) that are * required for this opcode type (1 through 6 args). - * yT - TARGETS: The number of targets (output operands) that are required + * yT - TARGETS: The number of targets (output operands) that are required * for this opcode type (0, 1, or 2 targets). - * zR - RETURN VALUE: Indicates whether this opcode type returns a value + * zR - RETURN VALUE: Indicates whether this opcode type returns a value * as the function return (0 or 1). * - * The AcpiExOpcode* functions are called via the Dispatcher component with + * The AcpiExOpcode* functions are called via the Dispatcher component with * fully resolved operands. !*/ - /******************************************************************************* * * FUNCTION: AcpiExOpcode_3A_0T_0R @@ -216,7 +215,6 @@ AcpiExOpcode_3A_0T_0R ( } - Cleanup: return_ACPI_STATUS (Status); @@ -250,12 +248,11 @@ AcpiExOpcode_3A_1T_1R ( FUNCTION_TRACE_STR ("ExOpcode_3A_1T_1R", AcpiPsGetOpcodeName (WalkState->Opcode)); - switch (WalkState->Opcode) { case AML_MID_OP: /* Mid (Source[0], Index[1], Length[2], Result[3]) */ - /* + /* * Create the return object. The Source operand is guaranteed to be * either a String or a Buffer, so just use its type. */ @@ -291,7 +288,8 @@ AcpiExOpcode_3A_1T_1R ( Buffer = ACPI_MEM_CALLOCATE (Length + 1); if (!Buffer) { - return (AE_NO_MEMORY); + Status = AE_NO_MEMORY; + goto Cleanup; } /* Copy the portion requested */ @@ -304,7 +302,7 @@ AcpiExOpcode_3A_1T_1R ( ReturnDesc->String.Pointer = Buffer; ReturnDesc->String.Length = Length; } - + break; @@ -337,5 +335,3 @@ Cleanup: } - - |