Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5bcc811 authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPICA: Fixed a problem with Index references passed as method arguments 

References passed as arguments to control methods were dereferenced
immediately (before control was passed to the called method). The
references are now correctly passed directly to the called
method.

http://bugzilla.kernel.org/show_bug.cgi?id=5389



Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1f549a24

drivers/acpi/executer/exresolv.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -194,6 +194,12 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, 




			case ACPI_TYPE_PACKAGE:

			case ACPI_TYPE_PACKAGE:





				/* If method call - leave the Reference on the stack */



				if (walk_state->opcode == AML_INT_METHODCALL_OP) {

					break;

				}



				obj_desc = *stack_desc->reference.where;

				obj_desc = *stack_desc->reference.where;

				if (obj_desc) {

				if (obj_desc) {

					/*

					/*
@@ -210,7 +216,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, 
					 * the package, can't dereference it

					 * the package, can't dereference it

					 */

					 */

					ACPI_ERROR((AE_INFO,

					ACPI_ERROR((AE_INFO,

						    "Attempt to deref an Index to NULL pkg element Idx=%p",

						    "Attempt to dereference an Index to NULL package element Idx=%p",

						    stack_desc));

						    stack_desc));

					status = AE_AML_UNINITIALIZED_ELEMENT;

					status = AE_AML_UNINITIALIZED_ELEMENT;

				}

				}
@@ -221,7 +227,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr, 
				/* Invalid reference object */

				/* Invalid reference object */





				ACPI_ERROR((AE_INFO,

				ACPI_ERROR((AE_INFO,

					    "Unknown TargetType %X in Index/Reference obj %p",

					    "Unknown TargetType %X in Index/Reference object %p",

					    stack_desc->reference.target_type,

					    stack_desc->reference.target_type,

					    stack_desc));

					    stack_desc));

				status = AE_AML_INTERNAL;

				status = AE_AML_INTERNAL;