lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPICA: Delete all attached data objects during namespace node deletion.

Browse Source 
This fix updates namespace node deletion to delete the entire list
of attached objects (attached via acpi_attach_data) instead of
just one of the attached items. ACPICA BZ 1024.
Tomasz Nowicki (tomasz.nowicki@linaro.org).

Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
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>
This commit is contained in:
Tomasz Nowicki
2013-11-21 12:19:55 +08:00
committed by Rafael J. Wysocki
parent 9a0a359725
commit 794ba09bf3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/acpica/nsalloc.c
View File

@@ -106,6 +106,7 @@ struct acpi_namespace_node *acpi_ns_create_node(u32 name)
void acpi_ns_delete_node(struct acpi_namespace_node *node) void acpi_ns_delete_node(struct acpi_namespace_node *node)
{ {
union acpi_operand_object *obj_desc; union acpi_operand_object *obj_desc;
union acpi_operand_object *next_desc;
ACPI_FUNCTION_NAME(ns_delete_node); ACPI_FUNCTION_NAME(ns_delete_node);
@@ -114,12 +115,13 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
acpi_ns_detach_object(node); acpi_ns_detach_object(node);
/* /*
* Delete an attached data object if present (an object that was created * Delete an attached data object list if present (objects that were
* and attached via acpi_attach_data). Note: After any normal object is * attached via acpi_attach_data). Note: After any normal object is
* detached above, the only possible remaining object is a data object. * detached above, the only possible remaining object(s) are data
* objects, in a linked list.
*/ */
obj_desc = node->object; obj_desc = node->object;
if (obj_desc && (obj_desc->common.type == ACPI_TYPE_LOCAL_DATA)) { while (obj_desc && (obj_desc->common.type == ACPI_TYPE_LOCAL_DATA)) {
/* Invoke the attached data deletion handler if present */ /* Invoke the attached data deletion handler if present */
@@ -127,7 +129,9 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node)
obj_desc->data.handler(node, obj_desc->data.pointer); obj_desc->data.handler(node, obj_desc->data.pointer);
} }
next_desc = obj_desc->common.next_object;
acpi_ut_remove_reference(obj_desc); acpi_ut_remove_reference(obj_desc);
obj_desc = next_desc;
} }
/* Now we can delete the node */ /* Now we can delete the node */