ACPICA: Dispatcher: Fix an unbalanced lock exit path in acpi_ds_auto_serialize_method()

zetalog · rafaeljw · commit 8121aa26e320 · 2016-10-29T01:57:43.000+02:00
There is a lock unbalanced exit path in acpi_ds_initialize_method(), this patch corrects it. Fixes: 441ad11 (ACPICA: Dispatcher: Fix a mutex issue for method auto serialization) Tested-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
@@ -128,7 +128,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node,
 	if (ACPI_FAILURE(status)) {
 		acpi_ds_delete_walk_state(walk_state);
 		acpi_ps_free_op(op);
-		return_ACPI_STATUS(status);
+		goto unlock;
 	}
 
 	walk_state->descending_callback = acpi_ds_detect_named_opcodes;

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ acpi_ds_auto_serialize_method(struct acpi_namespace_node *node,`
`128`	`128`	`if (ACPI_FAILURE(status)) {`
`129`	`129`	`acpi_ds_delete_walk_state(walk_state);`
`130`	`130`	`acpi_ps_free_op(op);`
`131`		`- return_ACPI_STATUS(status);`
	`131`	`+ goto unlock;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`walk_state->descending_callback = acpi_ds_detect_named_opcodes;`