Commit 12fc4dad authored Dec 05, 2020 by Daniel Scally Committed by Rafael J. Wysocki Dec 07, 2020

Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks"



This reverts commit 8a66790b.

Switching this function to AE_CTRL_TERMINATE broke the documented
behaviour of acpi_dev_get_resources() - AE_CTRL_TERMINATE does not, in
fact, terminate the resource walk because acpi_walk_resource_buffer()
ignores it (specifically converting it to AE_OK), referring to that
value as "an OK termination by the user function". This means that
acpi_dev_get_resources() does not abort processing when the preproc
function returns a negative value.

Signed-off-by: Daniel Scally <djrscally@gmail.com>
Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent b87e7459

drivers/acpi/resource.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -541,7 +541,7 @@ static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
		ret = c->preproc(ares, c->preproc_data);
		if (ret < 0) {
		c->error = ret;
		return AE_CTRL_TERMINATE;
		return AE_ABORT_METHOD;
		} else if (ret > 0) {
		return AE_OK;
		}

Admin message