aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dbnames.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2018-05-08 14:06:11 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-15 10:16:10 +0200
commit4032cc3e516f484f3d846369b901cad40388c391 (patch)
treec88eb8dfcb6c68041ebb087d4f8d5b6619ff42ae /drivers/acpi/acpica/dbnames.c
parentACPICA: Fix potential infinite loop in acpi_rs_dump_byte_list (diff)
downloadlinux-stable-4032cc3e516f484f3d846369b901cad40388c391.tar.xz
linux-stable-4032cc3e516f484f3d846369b901cad40388c391.zip
ACPICA: Improve error messages for the namespace root node
Replace "\___" with actual descriptive text. 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/dbnames.c')
-rw-r--r--drivers/acpi/acpica/dbnames.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/dbnames.c b/drivers/acpi/acpica/dbnames.c
index 170802c62179..dc94de91033e 100644
--- a/drivers/acpi/acpica/dbnames.c
+++ b/drivers/acpi/acpica/dbnames.c
@@ -189,9 +189,15 @@ void acpi_db_dump_namespace(char *start_arg, char *depth_arg)
}
acpi_db_set_output_destination(ACPI_DB_DUPLICATE_OUTPUT);
- acpi_os_printf("ACPI Namespace (from %4.4s (%p) subtree):\n",
- ((struct acpi_namespace_node *)subtree_entry)->name.
- ascii, subtree_entry);
+
+ if (((struct acpi_namespace_node *)subtree_entry)->parent) {
+ acpi_os_printf("ACPI Namespace (from %4.4s (%p) subtree):\n",
+ ((struct acpi_namespace_node *)subtree_entry)->
+ name.ascii, subtree_entry);
+ } else {
+ acpi_os_printf("ACPI Namespace (from %s):\n",
+ ACPI_NAMESPACE_ROOT);
+ }
/* Display the subtree */