aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLv Zheng <zetalog@gmail.com>2016-10-26 15:40:20 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-29 01:57:43 +0200
commit8121aa26e32012ca89afafa5e503b879950ac0fe (patch)
tree19dba2b5928c478fc18dde342e8ee827fcfe0c4d /drivers/acpi
parentACPICA: Dispatcher: Fix order issue of method termination (diff)
downloadlinux-dev-8121aa26e32012ca89afafa5e503b879950ac0fe.tar.xz
linux-dev-8121aa26e32012ca89afafa5e503b879950ac0fe.zip
ACPICA: Dispatcher: Fix an unbalanced lock exit path in acpi_ds_auto_serialize_method()
There is a lock unbalanced exit path in acpi_ds_initialize_method(), this patch corrects it. Fixes: 441ad11d078f (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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/dsmethod.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index c4028a8dacd5..5997e592e5a6 100644
--- 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;