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

Commit f83e13f9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-scan-fixes' and 'acpica-fixes' 

* acpi-scan-fixes:
  ACPI / scan: Set the visited flag for all enumerated devices

* acpica-fixes:
  Revert "ACPICA: Resources: Not a valid resource if buffer length too long"
parents f406270b 1315f016

drivers/acpi/acpica/utresrc.c

+5 −12
Original line number Diff line number Diff line
@@ -421,10 +421,8 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state, 


	ACPI_FUNCTION_TRACE(ut_walk_aml_resources);



	/*

	 * The absolute minimum resource template is one end_tag descriptor.

	 * However, we will treat a lone end_tag as just a simple buffer.

	 */

	/* The absolute minimum resource template is one end_tag descriptor */



	if (aml_length < sizeof(struct aml_resource_end_tag)) {

		return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);

	}
@@ -456,8 +454,9 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state, 
		/* Invoke the user function */



		if (user_function) {

			status = user_function(aml, length, offset,

					       resource_index, context);

			status =

			    user_function(aml, length, offset, resource_index,

					  context);

			if (ACPI_FAILURE(status)) {

				return_ACPI_STATUS(status);

			}
@@ -481,12 +480,6 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state, 
				*context = aml;

			}



			/* Check if buffer is defined to be longer than the resource length */



			if (aml_length > (offset + length)) {

				return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);

			}



			/* Normal exit */



			return_ACPI_STATUS(AE_OK);