summaryrefslogtreecommitdiffstats
path: root/source/components/namespace/nsobject.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-06-27 19:10:35 +0000
committerjkim <jkim@FreeBSD.org>2014-06-27 19:10:35 +0000
commitb4cfb84e01b0a37b535b69118259bb16e9614b0f (patch)
treeeeef1a6644e518893667349342fa66f9f0249fec /source/components/namespace/nsobject.c
parent34dc9d28dcb64ffb397ae86712fcea0cce546203 (diff)
downloadFreeBSD-src-b4cfb84e01b0a37b535b69118259bb16e9614b0f.zip
FreeBSD-src-b4cfb84e01b0a37b535b69118259bb16e9614b0f.tar.gz
Import ACPICA 20140627.
Diffstat (limited to 'source/components/namespace/nsobject.c')
-rw-r--r--source/components/namespace/nsobject.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/components/namespace/nsobject.c b/source/components/namespace/nsobject.c
index 3317591..9221ac0 100644
--- a/source/components/namespace/nsobject.c
+++ b/source/components/namespace/nsobject.c
@@ -265,6 +265,17 @@ AcpiNsDetachObject (
}
}
+ /*
+ * Detach the object from any data objects (which are still held by
+ * the namespace node)
+ */
+
+ if (ObjDesc->Common.NextObject &&
+ ((ObjDesc->Common.NextObject)->Common.Type == ACPI_TYPE_LOCAL_DATA))
+ {
+ ObjDesc->Common.NextObject = NULL;
+ }
+
/* Reset the node type to untyped */
Node->Type = ACPI_TYPE_ANY;
OpenPOWER on IntegriCloud