diff options
Diffstat (limited to 'drivers/acpi/acpica/exmutex.c')
-rw-r--r-- | drivers/acpi/acpica/exmutex.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c index bcceda5be9e3..d1f449d93dcf 100644 --- a/drivers/acpi/acpica/exmutex.c +++ b/drivers/acpi/acpica/exmutex.c | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | /****************************************************************************** | 1 | /****************************************************************************** |
3 | * | 2 | * |
4 | * Module Name: exmutex - ASL Mutex Acquire/Release functions | 3 | * Module Name: exmutex - ASL Mutex Acquire/Release functions |
@@ -305,7 +304,7 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc) | |||
305 | ACPI_FUNCTION_TRACE(ex_release_mutex_object); | 304 | ACPI_FUNCTION_TRACE(ex_release_mutex_object); |
306 | 305 | ||
307 | if (obj_desc->mutex.acquisition_depth == 0) { | 306 | if (obj_desc->mutex.acquisition_depth == 0) { |
308 | return (AE_NOT_ACQUIRED); | 307 | return_ACPI_STATUS(AE_NOT_ACQUIRED); |
309 | } | 308 | } |
310 | 309 | ||
311 | /* Match multiple Acquires with multiple Releases */ | 310 | /* Match multiple Acquires with multiple Releases */ |
@@ -462,7 +461,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread) | |||
462 | union acpi_operand_object *next = thread->acquired_mutex_list; | 461 | union acpi_operand_object *next = thread->acquired_mutex_list; |
463 | union acpi_operand_object *obj_desc; | 462 | union acpi_operand_object *obj_desc; |
464 | 463 | ||
465 | ACPI_FUNCTION_ENTRY(); | 464 | ACPI_FUNCTION_NAME(ex_release_all_mutexes); |
466 | 465 | ||
467 | /* Traverse the list of owned mutexes, releasing each one */ | 466 | /* Traverse the list of owned mutexes, releasing each one */ |
468 | 467 | ||
@@ -474,6 +473,10 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread) | |||
474 | obj_desc->mutex.next = NULL; | 473 | obj_desc->mutex.next = NULL; |
475 | obj_desc->mutex.acquisition_depth = 0; | 474 | obj_desc->mutex.acquisition_depth = 0; |
476 | 475 | ||
476 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, | ||
477 | "Force-releasing held mutex: %p\n", | ||
478 | obj_desc)); | ||
479 | |||
477 | /* Release the mutex, special case for Global Lock */ | 480 | /* Release the mutex, special case for Global Lock */ |
478 | 481 | ||
479 | if (obj_desc == acpi_gbl_global_lock_mutex) { | 482 | if (obj_desc == acpi_gbl_global_lock_mutex) { |