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

Commit b160987d authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Fixes a problem with control method references within packages 



Completes the package changes started with version 20071019.

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 f2d69559

drivers/acpi/dispatcher/dswexec.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) 


				op->common.node =

				    (struct acpi_namespace_node *)op->asl.value.

				    arg->asl.node->object;

				    arg->asl.node;

				acpi_ut_add_reference(op->asl.value.arg->asl.

						      node->object);

				return_ACPI_STATUS(AE_OK);

drivers/acpi/executer/exresnte.c

+2 −1
Original line number Diff line number Diff line
@@ -116,9 +116,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, 
	 * Several object types require no further processing:

	 * 1) Device/Thermal objects don't have a "real" subobject, return the Node

	 * 2) Method locals and arguments have a pseudo-Node

	 * 3) 10/2007: Added method type to assist with Package construction.

	 */

	if ((entry_type == ACPI_TYPE_DEVICE) ||

	    (entry_type == ACPI_TYPE_THERMAL) ||

	    (entry_type == ACPI_TYPE_METHOD) ||

	    (node->flags & (ANOBJ_METHOD_ARG | ANOBJ_METHOD_LOCAL))) {

		return_ACPI_STATUS(AE_OK);

	}
@@ -214,7 +216,6 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, 
		/* For these objects, just return the object attached to the Node */



	case ACPI_TYPE_MUTEX:

	case ACPI_TYPE_METHOD:

	case ACPI_TYPE_POWER:

	case ACPI_TYPE_PROCESSOR:

	case ACPI_TYPE_EVENT: