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/psobject.c | |
parent | 0ecfe310f4517d7505599be738158087c165be7c (diff) | |
parent | 08e1d7c0290aaef6bc6d68be8df753ffec02a6ae (diff) |
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/psobject.c')
-rw-r--r-- | drivers/acpi/acpica/psobject.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c index af1f46cd37a5..a6885077d59e 100644 --- a/drivers/acpi/acpica/psobject.c +++ b/drivers/acpi/acpica/psobject.c @@ -219,7 +219,10 @@ acpi_ps_build_named_op(struct acpi_walk_state *walk_state, status = walk_state->descending_callback(walk_state, op); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "During name lookup/catalog")); + if (status != AE_CTRL_TERMINATE) { + ACPI_EXCEPTION((AE_INFO, status, + "During name lookup/catalog")); + } return_ACPI_STATUS(status); } @@ -230,7 +233,7 @@ acpi_ps_build_named_op(struct acpi_walk_state *walk_state, status = acpi_ps_next_parse_state(walk_state, *op, status); if (ACPI_FAILURE(status)) { if (status == AE_CTRL_PENDING) { - return_ACPI_STATUS(AE_CTRL_PARSE_PENDING); + status = AE_CTRL_PARSE_PENDING; } return_ACPI_STATUS(status); } |