diff options
| author | jkim <jkim@FreeBSD.org> | 2014-02-17 17:10:41 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-02-17 17:10:41 +0000 |
| commit | 1e5f65118fdce3bca98a14153d598c52720e8947 (patch) | |
| tree | f33eb960cbd87cb5fa516e45153eb6351dc8ea2e /source/components/namespace/nsobject.c | |
| parent | 6fb9ae2c509f5b0c3e3643944c0ceaf09734e272 (diff) | |
| download | FreeBSD-src-1e5f65118fdce3bca98a14153d598c52720e8947.zip FreeBSD-src-1e5f65118fdce3bca98a14153d598c52720e8947.tar.gz | |
Import ACPICA 20140214.
Diffstat (limited to 'source/components/namespace/nsobject.c')
| -rw-r--r-- | source/components/namespace/nsobject.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/components/namespace/nsobject.c b/source/components/namespace/nsobject.c index a26ccc6..3317591 100644 --- a/source/components/namespace/nsobject.c +++ b/source/components/namespace/nsobject.c @@ -247,14 +247,19 @@ AcpiNsDetachObject ( } } - /* Clear the entry in all cases */ + /* Clear the Node entry in all cases */ Node->Object = NULL; if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) == ACPI_DESC_TYPE_OPERAND) { + /* Unlink object from front of possible object list */ + Node->Object = ObjDesc->Common.NextObject; + + /* Handle possible 2-descriptor object */ + if (Node->Object && - ((Node->Object)->Common.Type != ACPI_TYPE_LOCAL_DATA)) + (Node->Object->Common.Type != ACPI_TYPE_LOCAL_DATA)) { Node->Object = Node->Object->Common.NextObject; } |
