diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2017-08-03 08:27:42 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-03 23:34:18 +0200 |
| commit | d5efc154e797f72064ce5bac82213df09f1586b1 (patch) | |
| tree | 6afd6623240107bef734333a1529e1b54f1e57b7 /drivers/acpi/acpica | |
| parent | ACPICA: Resources: Allow _DMA method in walk resources (diff) | |
| download | linux-d5efc154e797f72064ce5bac82213df09f1586b1.tar.xz linux-d5efc154e797f72064ce5bac82213df09f1586b1.zip | |
ACPICA: Revert "Update resource descriptor handling"
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>
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/utresrc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c index 517acf8e77c8..f9801d13547f 100644 --- a/drivers/acpi/acpica/utresrc.c +++ b/drivers/acpi/acpica/utresrc.c @@ -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); } @@ -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); } |