From d82847acd400fca0404517d19fd5c0740e6e42db Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Thu, 15 Feb 2018 13:09:27 -0800 Subject: ACPICA: Update error message, no functional change ACPICA commit 0787fda3b224a78369e26ac6046658beb2b64c12 Clarify error when an attempt is made to evaluate things like devices, events, etc. -- these objects have no data and cannot be "evaluated". Link: https://github.com/acpica/acpica/commit/0787fda3 Signed-off-by: Bob Moore Signed-off-by: Erik Schmauss Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/nseval.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c index c2d883b8c45e..bdf94ec19c10 100644 --- a/drivers/acpi/acpica/nseval.c +++ b/drivers/acpi/acpica/nseval.c @@ -187,6 +187,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info) * 3) The object is not a method -- just return it's current value */ switch (acpi_ns_get_type(info->node)) { + case ACPI_TYPE_ANY: case ACPI_TYPE_DEVICE: case ACPI_TYPE_EVENT: case ACPI_TYPE_MUTEX: @@ -194,11 +195,12 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info) case ACPI_TYPE_THERMAL: case ACPI_TYPE_LOCAL_SCOPE: /* - * 1) Disallow evaluation of certain object types. For these, - * object evaluation is undefined and not supported. + * 1) Disallow evaluation of these object types. For these, + * object evaluation is undefined. */ ACPI_ERROR((AE_INFO, - "%s: Evaluation of object type [%s] is not supported", + "%s: This object type [%s] " + "never contains data and cannot be evaluated", info->full_pathname, acpi_ut_get_type_name(info->node->type))); -- cgit v1.2.3-55-g7522