Skip to content

Commit

Permalink
Merge branches 'acpi-scan-fixes' and 'acpica-fixes'
Browse files Browse the repository at this point in the history
* 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"
  • Loading branch information
Rafael J. Wysocki committed Apr 14, 2017
2 parents f406270 + 1315f01 commit f83e13f
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions drivers/acpi/acpica/utresrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
Expand Down

0 comments on commit f83e13f

Please sign in to comment.