aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/events/evxface.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-04-10 19:06:38 +0400
committerLen Brown <len.brown@intel.com>2008-04-22 14:29:23 -0400
commite5567afa5cfa19e45f93c9c8796e46187a2d12f4 (patch)
treeab02e06e8a7aad960b1188b5211c1ed9d3631cf0 /drivers/acpi/events/evxface.c
parent235eebbdb501261e9960deb2a9a3459af44ec0ea (diff)
ACPICA: Fix for update of the Global Lock Handle
Fixed a problem where the global lock handle was not properly updated if a thread that acquired the global lock via executing AML code then attempted to acquire the lock via the AcpiAcquireGlobalLock interface. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/events/evxface.c')
-rw-r--r--drivers/acpi/events/evxface.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index e210aa2d76d..412cae69831 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -782,15 +782,8 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
acpi_os_get_thread_id());
if (ACPI_SUCCESS(status)) {
- /*
- * If this was the first acquisition of the Global Lock by this thread,
- * create a new handle. Otherwise, return the existing handle.
- */
- if (acpi_gbl_global_lock_mutex->mutex.acquisition_depth == 1) {
- acpi_gbl_global_lock_handle++;
- }
- /* Return the global lock handle */
+ /* Return the global lock handle (updated in acpi_ev_acquire_global_lock) */
*handle = acpi_gbl_global_lock_handle;
}