]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ACPICA: Revert "Update resource descriptor handling"
authorErik Schmauss <erik.schmauss@intel.com>
Thu, 3 Aug 2017 06:27:42 +0000 (14:27 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 21:34:18 +0000 (23:34 +0200)
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>
drivers/acpi/acpica/utresrc.c

index 517acf8e77c8042ed62be801801c152458df5e2b..f9801d13547fe51685fb66b80190a5150459a3e4 100644 (file)
@@ -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);
                }