aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nsobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica/nsobject.c')
-rw-r--r--drivers/acpi/acpica/nsobject.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index fe54a8c73b8c..f1ea8e56cd87 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -239,6 +239,17 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
}
}
+ /*
+ * Detach the object from any data objects (which are still held by
+ * the namespace node)
+ */
+
+ if (obj_desc->common.next_object &&
+ ((obj_desc->common.next_object)->common.type ==
+ ACPI_TYPE_LOCAL_DATA)) {
+ obj_desc->common.next_object = NULL;
+ }
+
/* Reset the node type to untyped */
node->type = ACPI_TYPE_ANY;