ACPICA: Namespace: Fix wrong error log
authorLv Zheng <lv.zheng@intel.com>
Tue, 29 Dec 2015 05:52:51 +0000 (13:52 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Jan 2016 02:26:44 +0000 (03:26 +0100)
ACPICA commit 20228e39e125d92f9d80c6e07d3767b225d0536e

The Info->Node in acpi_ns_init_one_device() may not be initialized. Even it is
initialized, the redundant "._INI" can be seen for this log entry. This
patch fixes this issue by using device_node instead. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/20228e39
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/nsinit.c

index b744a53618eb3977663ab75a6a31e808e96b5aeb..656eacfeac56abe0c0d4c3acd04bfb0472125e0f 100644 (file)
@@ -582,7 +582,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 
                /* Ignore error and move on to next device */
 
-               char *scope_name = acpi_ns_get_external_pathname(info->node);
+               char *scope_name = acpi_ns_get_external_pathname(device_node);
 
                ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",
                                scope_name));