Commit 6d9229d6 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

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: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3bd38469

drivers/acpi/acpica/nsaccess.c

+16 −6
Original line number Diff line number Diff line
@@ -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));



					/* Current scope has no parent scope */

						ACPI_FREE(external_path);

					}



					ACPI_ERROR((AE_INFO,

						    "%s: Path has too many parent prefixes (^) "

						    "- reached beyond root node",

						    pathname));

					return_ACPI_STATUS(AE_NOT_FOUND);

				}

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE