1 files changed, 14 insertions, 5 deletions

diff --git a/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c b/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c
index d043cf87d183..1d44bd845c4a 100644
--- a/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c
+++ b/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psparse - Parser top level AML parse routines
- *              $Revision: 71 $
+ *              $Revision: 74 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -658,13 +658,22 @@ AcpiPsParseLoop (
                  */
 
                 Status = AcpiDsGetPredicateValue (WalkState, NULL, TRUE);
-                if (Status == AE_AML_NO_OPERAND)
+                if (ACPI_FAILURE (Status) &&
+                    ((Status & AE_CODE_MASK) != AE_CODE_CONTROL))
                 {
+                    if (Status == AE_AML_NO_RETURN_VALUE)
+                    {
+                        DEBUG_PRINT (ACPI_ERROR,
+                            ("PsParseLoop: Invoked method did not return a value, %s\n",
+                            AcpiCmFormatException (Status)));
+
+                    }
                     DEBUG_PRINT (ACPI_ERROR,
-                        ("PsParseLoop: Invoked method did not return a value, %s\n",
+                        ("PsParseLoop: GetPredicate Failed, %s\n",
                         AcpiCmFormatException (Status)));
-
+                    return_ACPI_STATUS (Status);
                 }
+
                 Status = AcpiPsNextParseState (WalkState, Op, Status);
             }