1 files changed, 8 insertions, 2 deletions
diff --git a/source/compiler/dttable1.c b/source/compiler/dttable1.c
index 138f4f3a1731..9b755509ff09 100644
--- a/source/compiler/dttable1.c
+++ b/source/compiler/dttable1.c
@@ -596,7 +596,13 @@ DtCompileDbg2 (
 
         Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2OemData,
             &Subtable, TRUE);
-        if (ACPI_FAILURE (Status))
+        if (Status == AE_END_OF_TABLE)
+        {
+            /* optional field was not found and we're at the end of the file */
+
+            goto subtableDone;
+        }
+        else if (ACPI_FAILURE (Status))
         {
             return (Status);
         }
@@ -615,7 +621,7 @@ DtCompileDbg2 (
 
             DtInsertSubtable (ParentTable, Subtable);
         }
-
+subtableDone:
         SubtableCount--;
         DtPopSubtable (); /* Get next Device Information subtable */
     }