1 files changed, 3 insertions, 11 deletions
diff --git a/source/tools/acpiexec/aehandlers.c b/source/tools/acpiexec/aehandlers.c
index 2447414..aa6540d 100644
--- a/source/tools/acpiexec/aehandlers.c
+++ b/source/tools/acpiexec/aehandlers.c
@@ -460,6 +460,8 @@ AeExceptionHandler (
             NewAmlStatus = (ACPI_STATUS)
                 ((ACPI_OBJECT *) ReturnObj.Pointer)->Integer.Value;
 
+            /* Free a buffer created via ACPI_ALLOCATE_BUFFER */
+
             AcpiOsFree (ReturnObj.Pointer);
         }
     }
@@ -1049,21 +1051,11 @@ AeInstallEarlyHandlers (
         Status = AcpiDetachData (Handle, AeAttachedDataHandler);
         AE_CHECK_OK (AcpiDetachData, Status);
 
-        /* Test attach data at the root object */
-
-        Status = AcpiAttachData (ACPI_ROOT_OBJECT, AeAttachedDataHandler,
-            AcpiGbl_RootNode);
-        AE_CHECK_OK (AcpiAttachData, Status);
-
-        Status = AcpiAttachData (ACPI_ROOT_OBJECT, AeAttachedDataHandler2,
-            AcpiGbl_RootNode);
+        Status = AcpiAttachData (Handle, AeAttachedDataHandler, Handle);
         AE_CHECK_OK (AcpiAttachData, Status);
 
         /* Test support for multiple attaches */
 
-        Status = AcpiAttachData (Handle, AeAttachedDataHandler, Handle);
-        AE_CHECK_OK (AcpiAttachData, Status);
-
         Status = AcpiAttachData (Handle, AeAttachedDataHandler2, Handle);
         AE_CHECK_OK (AcpiAttachData, Status);
     }