1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 1c7efc15225f..4071bad4458e 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -162,6 +162,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_type)
 acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)
 {
         struct acpi_namespace_node *node;
+        struct acpi_namespace_node *parent_node;
         acpi_status status;
 
         if (!ret_handle) {
@@ -189,12 +190,12 @@ acpi_status acpi_get_parent(acpi_handle handle, acpi_handle * ret_handle)
 
         /* Get the parent entry */
 
-        *ret_handle =
-            acpi_ns_convert_entry_to_handle(acpi_ns_get_parent_node(node));
+        parent_node = acpi_ns_get_parent_node(node);
+        *ret_handle = acpi_ns_convert_entry_to_handle(parent_node);
 
         /* Return exception if parent is null */
 
-        if (!acpi_ns_get_parent_node(node)) {
+        if (!parent_node) {
                 status = AE_NULL_ENTRY;
         }
 
@@ -268,7 +269,7 @@ acpi_get_next_object(acpi_object_type type,
 
         /* Internal function does the real work */
 
-        node = acpi_ns_get_next_node(type, parent_node, child_node);
+        node = acpi_ns_get_next_node_typed(type, parent_node, child_node);
         if (!node) {
                 status = AE_NOT_FOUND;
                 goto unlock_and_exit;