vendor/acpica/20150410

3 files changed, 8 insertions, 31 deletions

diff --git a/changes.txt b/changes.txt
index 850685bd9c6a..ad9d23c612d3 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,11 @@
 ----------------------------------------
+10 April 2015. Summary of changes for version 20150410:
+
+Reverted a change introduced in version 20150408 that caused
+a regression in the disassembler where incorrect operator
+symbols could be emitted.
+
+----------------------------------------
 08 April 2015. Summary of changes for version 20150408:
 
 
diff --git a/source/components/disassembler/dmcstyle.c b/source/components/disassembler/dmcstyle.c
index 71aef9b0e9fb..1f1381969f57 100644
--- a/source/components/disassembler/dmcstyle.c
+++ b/source/components/disassembler/dmcstyle.c
@@ -114,20 +114,12 @@ AcpiDmCheckForSymbolicOpcode (
     Child1 = AcpiPsGetArg (Op, 0);
     if (!Child1)
     {
-        /* Parse tree may be confused or corrupted */
-
         return (FALSE);
     }
 
     /* Get the second operand */
 
     Child2 = Child1->Common.Next;
-    if (!Child2)
-    {
-        /* Parse tree may be confused or corrupted */
-
-        return (FALSE);
-    }
 
     /* Setup the operator string for this opcode */
 
@@ -307,16 +299,8 @@ AcpiDmCheckForSymbolicOpcode (
         /* Target is 3rd operand */
 
         Target = Child2->Common.Next;
-
         if (Op->Common.AmlOpcode == AML_DIVIDE_OP)
         {
-            if (!Target)
-            {
-                /* Parse tree may be confused or corrupted */
-
-                return (FALSE);
-            }
-
             /*
              * Divide has an extra target operand (Remainder).
              * If this extra target is specified, it cannot be converted
@@ -419,13 +403,6 @@ AcpiDmCheckForSymbolicOpcode (
         /* Target is optional, 3rd operand */
 
         Target = Child2->Common.Next;
-        if (!Target)
-        {
-            /* Parse tree may be confused or corrupted */
-
-            return (FALSE);
-        }
-
         if (AcpiDmIsValidTarget (Target))
         {
             AcpiDmPromoteTarget (Op, Target);
@@ -446,13 +423,6 @@ AcpiDmCheckForSymbolicOpcode (
          * source so that the target is processed first.
          */
         Target = Child1->Common.Next;
-        if (!Target)
-        {
-            /* Parse tree may be confused or corrupted */
-
-            return (FALSE);
-        }
-
         AcpiDmPromoteTarget (Op, Target);
 
         if (!Target->Common.OperatorSymbol)
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index 04ae5cda21d0..9d3891606a90 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20150408
+#define ACPI_CA_VERSION                 0x20150410
 
 #include "acconfig.h"
 #include "actypes.h"