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

Commit 71b43ca4 authored by Len Brown's avatar Len Brown
Browse files

Pull acpica into release branch

parents 3dd6786f fd350943

drivers/acpi/dispatcher/dsopcode.c

+1 −2
Original line number Diff line number Diff line
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state, 
		    ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) &&

		     (op->common.parent->common.aml_opcode !=

		      AML_VAR_PACKAGE_OP)

		     && (op->common.parent->common.aml_opcode !=

			 AML_NAME_OP))) {

		     && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {

			walk_state->result_obj = obj_desc;

		}

	}

drivers/acpi/dispatcher/dsutils.c

+3 −4
Original line number Diff line number Diff line
@@ -556,8 +556,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state, 
					 * indicate this to the interpreter, set the

					 * object to the root

					 */

					obj_desc =

					    ACPI_CAST_PTR(union

					obj_desc = ACPI_CAST_PTR(union

								 acpi_operand_object,

								 acpi_gbl_root_node);

					status = AE_OK;

drivers/acpi/dispatcher/dswstate.c

+3 −6
Original line number Diff line number Diff line
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread) 
 *

 ******************************************************************************/



struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,

						  union acpi_parse_object

						  *origin,

						  union acpi_operand_object

						  *method_desc,

						  struct acpi_thread_state

struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object

						  *origin, union acpi_operand_object

						  *method_desc, struct acpi_thread_state

						  *thread)

{

	struct acpi_walk_state *walk_state;

drivers/acpi/events/evgpe.c

+2 −3
Original line number Diff line number Diff line
@@ -341,8 +341,7 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device, 


	/* A Non-NULL gpe_device means this is a GPE Block Device */



	obj_desc =

	    acpi_ns_get_attached_object((struct acpi_namespace_node *)

	obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *)

					       gpe_device);

	if (!obj_desc || !obj_desc->device.gpe_block) {

		return (NULL);

drivers/acpi/events/evgpeblk.c

+1 −2
Original line number Diff line number Diff line
@@ -1033,8 +1033,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, 


			if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==

			     ACPI_GPE_DISPATCH_METHOD)

			    && (gpe_event_info->

				flags & ACPI_GPE_TYPE_RUNTIME)) {

			    && (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {

				gpe_enabled_count++;

			}