Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / acpi / acpica / nswalk.c

diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 00e79fb260295e6647f336e9efa6237b0cf9230e..2cd5be8fe10f40c547cea2ccb9190f509114ddd8 100644 (file)
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -79,15 +79,6 @@ struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
                return parent_node->child;
        }
 
-       /*
-        * Get the next node.
-        *
-        * If we are at the end of this peer list, return NULL
-        */
-       if (child_node->flags & ANOBJ_END_OF_PEER_LIST) {
-               return NULL;
-       }
-
        /* Otherwise just return the next peer */
 
        return child_node->peer;
@@ -146,9 +137,9 @@ struct acpi_namespace_node *acpi_ns_get_next_node_typed(acpi_object_type type,
                        return (next_node);
                }
 
-               /* Otherwise, move on to the next node */
+               /* Otherwise, move on to the next peer node */
 
-               next_node = acpi_ns_get_next_valid_node(next_node);
+               next_node = next_node->peer;
        }
 
        /* Not found */
@@ -355,7 +346,7 @@ acpi_ns_walk_namespace(acpi_object_type type,
                         */
                        level--;
                        child_node = parent_node;
-                       parent_node = acpi_ns_get_parent_node(parent_node);
+                       parent_node = parent_node->parent;
 
                        node_previously_visited = TRUE;
                }