Skip to content

Commit

Permalink
ACPICA: Revert "Update resource descriptor handling"
Browse files Browse the repository at this point in the history
ACPICA commit f3300640c63df138d133740b54e2c0a1befa4086

This reverts commit c8eac10178b387f9eb1935694e509d4518da77bb.

Link: https://github.com/acpica/acpica/commit/f3300640
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Erik Schmauss authored and Rafael J. Wysocki committed Aug 3, 2017
1 parent 137c783 commit d5efc15
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/acpi/acpica/utresrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,9 @@ 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.
*/
if (aml_length <= sizeof(struct aml_resource_end_tag)) {
/* 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 @@ -252,10 +250,8 @@ acpi_ut_walk_aml_resources(struct acpi_walk_state *walk_state,
*context = aml;
}

/*
* Normal exit. Note: We allow the buffer to be larger than
* the resource template, as long as the END_TAG exists.
*/
/* Normal exit */

return_ACPI_STATUS(AE_OK);
}

Expand Down

0 comments on commit d5efc15

Please sign in to comment.