vserver 1.9.5.x5

[linux-2.6.git] / drivers / acpi / dispatcher / dsutils.c

diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 2446278..df6b001 100644 (file)
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2004, R. Byron Moore
+ * Copyright (C) 2000 - 2005, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88,11 +88,13 @@ acpi_ds_is_result_used (
        }
 
        /*
-        * If there is no parent, we are executing at the method level.
-        * An executing method typically has no parent, since each method
-        * is parsed separately.
+        * If there is no parent, or the parent is a scope_op, we are executing
+        * at the method level. An executing method typically has no parent,
+        * since each method is parsed separately.  A method invoked externally
+        * via execute_control_method has a scope_op as the parent.
         */
-       if (!op->common.parent) {
+       if ((!op->common.parent) ||
+               (op->common.parent->common.aml_opcode == AML_SCOPE_OP)) {
                /*
                 * If this is the last statement in the method, we know it is not a
                 * Return() operator (would not come here.) The following code is the
@@ -333,7 +335,7 @@ acpi_ds_clear_operands (
        u32                             i;
 
 
-       ACPI_FUNCTION_TRACE_PTR ("acpi_ds_clear_operands", walk_state);
+       ACPI_FUNCTION_TRACE_PTR ("ds_clear_operands", walk_state);
 
 
        /*