summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-16 21:55:48 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-11-16 21:55:48 +0100
commit8a66790b7850a6669129af078768a1d42076a0ef (patch)
tree909b3cb9e23198edca48c38942583b6e6aee04f8 /drivers/acpi
parent8e345c991c8c7a3c081199ef77deada79e37618a (diff)
downloadlinux-3.10-8a66790b7850a6669129af078768a1d42076a0ef.tar.gz
linux-3.10-8a66790b7850a6669129af078768a1d42076a0ef.tar.bz2
linux-3.10-8a66790b7850a6669129af078768a1d42076a0ef.zip
ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks
Currently acpi_dev_process_resource() returns AE_ABORT_METHOD to terminate the acpi_walk_resources() it is called from if the .preproc() routine provided by the caller of acpi_dev_get_resources() initiating the resources walk returns an error code. It is better to use AE_CTRL_TERMINATE for this purpose, however, so do that. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/resource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 2bafc25482b..4107c004467 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -446,7 +446,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_ABORT_METHOD;
+ return AE_CTRL_TERMINATE;
} else if (ret > 0) {
return AE_OK;
}