diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:26 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:26 +0200 |
commit | 08476907abf25315acb4c9a72a0e78bf61456696 (patch) | |
tree | 2f1c0f34771029458813c3015ef9b02b7333dfde /drivers/acpi/acpica/psloop.c | |
parent | 0ecfe310f4517d7505599be738158087c165be7c (diff) | |
parent | 08e1d7c0290aaef6bc6d68be8df753ffec02a6ae (diff) | |
download | linux-next-08476907abf25315acb4c9a72a0e78bf61456696.tar.gz |
Merge branch 'acpica'
* acpica:
ACPICA: Enable auto-serialization as a default kernel behavior.
ACPICA: Ignore sync_level for methods that have been auto-serialized.
ACPICA: Add additional named objects for the auto-serialize method scan.
ACPICA: Add auto-serialization support for ill-behaved control methods.
ACPICA: Remove global option to serialize all control methods.
Diffstat (limited to 'drivers/acpi/acpica/psloop.c')
-rw-r--r-- | drivers/acpi/acpica/psloop.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c index 646d1a3f6e27..b058e2390fdd 100644 --- a/drivers/acpi/acpica/psloop.c +++ b/drivers/acpi/acpica/psloop.c @@ -480,6 +480,10 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) status = AE_OK; } + if (status == AE_CTRL_TERMINATE) { + return_ACPI_STATUS(status); + } + status = acpi_ps_complete_op(walk_state, &op, status); |