Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / drivers / acpi / namespace / nswalk.c

diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index bccf27d712e146f042a306ff4e40275034c97669..3c905ce26d7d209d93b0b28242fc79b851a18bc7 100644 (file)
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,10 +65,8 @@ ACPI_MODULE_NAME("nswalk")
  *              within Scope is returned.
  *
  ******************************************************************************/
-struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
-                                                 struct acpi_namespace_node
-                                                 *parent_node,
-                                                 struct acpi_namespace_node
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
+                                                 *parent_node, struct acpi_namespace_node
                                                  *child_node)
 {
        struct acpi_namespace_node *next_node = NULL;
@@ -79,9 +77,7 @@ struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
 
                /* It's really the parent's _scope_ that we want */
 
-               if (parent_node->child) {
-                       next_node = parent_node->child;
-               }
+               next_node = parent_node->child;
        }
 
        else {