summaryrefslogtreecommitdiffstats
path: root/source/components/namespace/nsobject.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-09-11 21:38:09 +0000
committerjkim <jkim@FreeBSD.org>2014-09-11 21:38:09 +0000
commit9f91b0b83a53651519b3bbe3b8c1f2a324da984e (patch)
tree67d2b76905535d056ba6911186285d0325dc703f /source/components/namespace/nsobject.c
parentb4cfb84e01b0a37b535b69118259bb16e9614b0f (diff)
downloadFreeBSD-src-9f91b0b83a53651519b3bbe3b8c1f2a324da984e.zip
FreeBSD-src-9f91b0b83a53651519b3bbe3b8c1f2a324da984e.tar.gz
Import ACPICA 20140828.
Diffstat (limited to 'source/components/namespace/nsobject.c')
-rw-r--r--source/components/namespace/nsobject.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/source/components/namespace/nsobject.c b/source/components/namespace/nsobject.c
index 9221ac0..5247ca6 100644
--- a/source/components/namespace/nsobject.c
+++ b/source/components/namespace/nsobject.c
@@ -42,7 +42,6 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
-
#define __NSOBJECT_C__
#include "acpi.h"
@@ -263,17 +262,16 @@ AcpiNsDetachObject (
{
Node->Object = Node->Object->Common.NextObject;
}
- }
-
- /*
- * 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;
+ /*
+ * 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 */
OpenPOWER on IntegriCloud