From 97d746578b1fc4ce461e6279220cab3605f02469 Mon Sep 17 00:00:00 2001 From: Octavian Purdila Date: Tue, 16 Dec 2014 18:12:30 +0200 Subject: [PATCH] ACPICA: take ACPI_MTX_INTERPRETER in acpi_unload_table_id() acpi_tb_delete_namespace_by_owner() expects ACPI_MTX_INTERPRETER to be taken. This fixes the following issue: ACPI Error: Mutex [0x0] is not acquired, cannot release (20141107/utmutex-322) Call Trace: [] dump_stack+0x4f/0x7b [] acpi_ut_release_mutex+0x47/0x67 [] acpi_tb_delete_namespace_by_owner+0x57/0x8d [] acpi_unload_table_id+0x3a/0x5e Signed-off-by: Octavian Purdila Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/tbxface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c index 6482b0ded652..9520ae19bb37 100644 --- a/drivers/acpi/acpica/tbxface.c +++ b/drivers/acpi/acpica/tbxface.c @@ -281,6 +281,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) ACPI_FUNCTION_TRACE(acpi_unload_table_id); + status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } + /* Find table in the global table list */ for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) { if (id != acpi_gbl_root_table_list.tables[i].owner_id) { @@ -297,6 +302,8 @@ acpi_status acpi_unload_table_id(acpi_owner_id id) acpi_tb_set_table_loaded_flag(i, FALSE); break; } + + (void)acpi_ut_release_mutex(ACPI_MTX_INTERPRETER); return_ACPI_STATUS(status); } -- 2.34.1