summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nsalloc.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2013-11-21 05:20:06 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-21 13:47:04 +0100
commit3f69fe153133f781d546f0c53f7dd3889275c90d (patch)
treef2250c42949b7202f27615b64c5660ce410f26db /drivers/acpi/acpica/nsalloc.c
parentACPICA: Delete all attached data objects during namespace node deletion. (diff)
downloadlinux-3f69fe153133f781d546f0c53f7dd3889275c90d.tar.xz
linux-3f69fe153133f781d546f0c53f7dd3889275c90d.zip
ACPICA: Add support to delete all objects attached to the root namespace node.
This fix deletes any and all objects that have been attached to the root node (via acpi_attach_data). Reported by Tomasz Nowicki. ACPICA BZ 1026. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nsalloc.c')
-rw-r--r--drivers/acpi/acpica/nsalloc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index bc3f598257a2..fd1ff54cda19 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -134,6 +134,12 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
obj_desc = next_desc;
}
+ /* Special case for the statically allocated root node */
+
+ if (node == acpi_gbl_root_node) {
+ return;
+ }
+
/* Now we can delete the node */
(void)acpi_os_release_object(acpi_gbl_namespace_cache, node);