ACPICA: Namespace: Update/fix an error message

ACPICA commit 8b7fa979ef81469e70f501f582466a265d6f595b

Was emitting an internal namestring without converting it to
the external format.

Link: https://github.com/acpica/acpica/commit/8b7fa979
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 14be12fe9f351cfd288fe4fac17a66a3fb2c74a4..f2733f51ca8d12bebda8eff34323d7393b1bf3be 100644 (file)
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -292,6 +292,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
 {
        acpi_status status;
        char *path = pathname;
+       char *external_path;
        struct acpi_namespace_node *prefix_node;
        struct acpi_namespace_node *current_node = NULL;
        struct acpi_namespace_node *this_node = NULL;
@@ -427,13 +428,22 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                                num_carats++;
                                this_node = this_node->parent;
                                if (!this_node) {
+                                       /*
+                                        * Current scope has no parent scope. Externalize
+                                        * the internal path for error message.
+                                        */
+                                       status =
+                                           acpi_ns_externalize_name
+                                           (ACPI_UINT32_MAX, pathname, NULL,
+                                            &external_path);
+                                       if (ACPI_SUCCESS(status)) {
+                                               ACPI_ERROR((AE_INFO,
+                                                           "%s: Path has too many parent prefixes (^)",
+                                                           external_path));
+
+                                               ACPI_FREE(external_path);
+                                       }
 
-                                       /* Current scope has no parent scope */
-
-                                       ACPI_ERROR((AE_INFO,
-                                                   "%s: Path has too many parent prefixes (^) "
-                                                   "- reached beyond root node",
-                                                   pathname));
                                        return_ACPI_STATUS(AE_NOT_FOUND);
                                }
                        }