Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

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

diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index c6619d8a516451b8d98ab05e8e61c982b8c6a476..94eb8f332d941bb67a0175e85f17d4560ecd4f4d 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 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -194,24 +194,28 @@ acpi_ns_walk_namespace(acpi_object_type type,
                                          child_node);
                if (child_node) {
 
-                       /* Found node, Get the type if we are not searching for ANY */
+                       /* Found next child, get the type if we are not searching for ANY */
 
                        if (type != ACPI_TYPE_ANY) {
                                child_type = child_node->type;
                        }
 
                        /*
-                        * 1) Type must match
-                        * 2) Permanent namespace nodes are OK
-                        * 3) Ignore temporary nodes unless told otherwise. Typically,
-                        *    the temporary nodes can cause a race condition where they can
-                        *    be deleted during the execution of the user function. Only the
-                        *    debugger namespace dump will examine the temporary nodes.
+                        * Ignore all temporary namespace nodes (created during control
+                        * method execution) unless told otherwise. These temporary nodes
+                        * can cause a race condition because they can be deleted during the
+                        * execution of the user function (if the namespace is unlocked before
+                        * invocation of the user function.) Only the debugger namespace dump
+                        * will examine the temporary nodes.
                         */
-                       if ((child_type == type) &&
-                           (!(child_node->flags & ANOBJ_TEMPORARY) ||
-                            (child_node->flags & ANOBJ_TEMPORARY)
-                            && (flags & ACPI_NS_WALK_TEMP_NODES))) {
+                       if ((child_node->flags & ANOBJ_TEMPORARY) &&
+                           !(flags & ACPI_NS_WALK_TEMP_NODES)) {
+                               status = AE_CTRL_DEPTH;
+                       }
+
+                       /* Type must match requested type */
+
+                       else if (child_type == type) {
                                /*
                                 * Found a matching node, invoke the user callback function.
                                 * Unlock the namespace if flag is set.