diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpica/exmutex.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c index bb2efcfb81e2..f73be97043c0 100644 --- a/drivers/acpi/acpica/exmutex.c +++ b/drivers/acpi/acpica/exmutex.c | |||
@@ -85,10 +85,10 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc) | |||
85 | (obj_desc->mutex.prev)->mutex.next = obj_desc->mutex.next; | 85 | (obj_desc->mutex.prev)->mutex.next = obj_desc->mutex.next; |
86 | 86 | ||
87 | /* | 87 | /* |
88 | * Migrate the previous sync level associated with this mutex to the | 88 | * Migrate the previous sync level associated with this mutex to |
89 | * previous mutex on the list so that it may be preserved. This handles | 89 | * the previous mutex on the list so that it may be preserved. |
90 | * the case where several mutexes have been acquired at the same level, | 90 | * This handles the case where several mutexes have been acquired |
91 | * but are not released in opposite order. | 91 | * at the same level, but are not released in opposite order. |
92 | */ | 92 | */ |
93 | (obj_desc->mutex.prev)->mutex.original_sync_level = | 93 | (obj_desc->mutex.prev)->mutex.original_sync_level = |
94 | obj_desc->mutex.original_sync_level; | 94 | obj_desc->mutex.original_sync_level; |
@@ -101,8 +101,8 @@ void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc) | |||
101 | * | 101 | * |
102 | * FUNCTION: acpi_ex_link_mutex | 102 | * FUNCTION: acpi_ex_link_mutex |
103 | * | 103 | * |
104 | * PARAMETERS: obj_desc - The mutex to be linked | 104 | * PARAMETERS: obj_desc - The mutex to be linked |
105 | * Thread - Current executing thread object | 105 | * Thread - Current executing thread object |
106 | * | 106 | * |
107 | * RETURN: None | 107 | * RETURN: None |
108 | * | 108 | * |
@@ -138,9 +138,9 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc, | |||
138 | * | 138 | * |
139 | * FUNCTION: acpi_ex_acquire_mutex_object | 139 | * FUNCTION: acpi_ex_acquire_mutex_object |
140 | * | 140 | * |
141 | * PARAMETERS: time_desc - Timeout in milliseconds | 141 | * PARAMETERS: Timeout - Timeout in milliseconds |
142 | * obj_desc - Mutex object | 142 | * obj_desc - Mutex object |
143 | * Thread - Current thread state | 143 | * thread_id - Current thread state |
144 | * | 144 | * |
145 | * RETURN: Status | 145 | * RETURN: Status |
146 | * | 146 | * |
@@ -234,7 +234,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc, | |||
234 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 234 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
235 | } | 235 | } |
236 | 236 | ||
237 | /* Must have a valid thread ID */ | 237 | /* Must have a valid thread state struct */ |
238 | 238 | ||
239 | if (!walk_state->thread) { | 239 | if (!walk_state->thread) { |
240 | ACPI_ERROR((AE_INFO, | 240 | ACPI_ERROR((AE_INFO, |
@@ -435,6 +435,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, | |||
435 | 435 | ||
436 | owner_thread->current_sync_level = previous_sync_level; | 436 | owner_thread->current_sync_level = previous_sync_level; |
437 | } | 437 | } |
438 | |||
438 | return_ACPI_STATUS(status); | 439 | return_ACPI_STATUS(status); |
439 | } | 440 | } |
440 | 441 | ||
@@ -442,7 +443,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, | |||
442 | * | 443 | * |
443 | * FUNCTION: acpi_ex_release_all_mutexes | 444 | * FUNCTION: acpi_ex_release_all_mutexes |
444 | * | 445 | * |
445 | * PARAMETERS: Thread - Current executing thread object | 446 | * PARAMETERS: Thread - Current executing thread object |
446 | * | 447 | * |
447 | * RETURN: Status | 448 | * RETURN: Status |
448 | * | 449 | * |