summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/psparse.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2019-02-15 13:36:09 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-02-18 11:21:10 +0100
commit991371e0dd4ef9587199f63f6ffd979084efff4d (patch)
treeb24bcd39609aaaea7da08c95a20402b427cf8e82 /drivers/acpi/acpica/psparse.c
parent90791fbbd2df364a28d92c55be5aa96936ff9f52 (diff)
downloadlinux-rt-991371e0dd4ef9587199f63f6ffd979084efff4d.tar.gz
ACPICA: Update/clarify messages for control method failures
ACPICA commit 2efd616e5b1c960f407763e6782f7dc259ea55df Attempting to improve error messages to clarify that errors are bubbled up from the original error, possibly across nested methods. Link: https://github.com/acpica/acpica/commit/2efd616e Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/psparse.c')
-rw-r--r--drivers/acpi/acpica/psparse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 3f381ffd9581..9b386530ffbe 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -523,12 +523,12 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
if (status == AE_ABORT_METHOD) {
acpi_ns_print_node_pathname(walk_state->
method_node,
- "Method aborted:");
+ "Aborting method");
acpi_os_printf("\n");
} else {
- ACPI_ERROR_METHOD
- ("Method parse/execution failed",
- walk_state->method_node, NULL, status);
+ ACPI_ERROR_METHOD("Aborting method",
+ walk_state->method_node, NULL,
+ status);
}
acpi_ex_enter_interpreter();