aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/events/evmisc.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-05-10 02:49:34 -0400
committerLen Brown <len.brown@intel.com>2007-05-10 02:49:34 -0400
commit71b43ca46fc5f0588ef64a14c6133c19a9b3f1ea (patch)
treeaf25c06aa1af3ff2c210fe4b39abfdda55b84349 /drivers/acpi/events/evmisc.c
parent3dd6786f55219f87fd33e153669600d715ca9270 (diff)
parentfd3509436fde38d4c854bf5a6b83d2c779904f8e (diff)
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/events/evmisc.c')
-rw-r--r--drivers/acpi/events/evmisc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index ad447b1d97a3..21cb749d0c75 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -320,8 +320,9 @@ static u32 acpi_ev_global_lock_handler(void *context)
320 acpi_gbl_global_lock_acquired = TRUE; 320 acpi_gbl_global_lock_acquired = TRUE;
321 /* Send a unit to the semaphore */ 321 /* Send a unit to the semaphore */
322 322
323 if (ACPI_FAILURE(acpi_os_signal_semaphore( 323 if (ACPI_FAILURE
324 acpi_gbl_global_lock_semaphore, 1))) { 324 (acpi_os_signal_semaphore
325 (acpi_gbl_global_lock_semaphore, 1))) {
325 ACPI_ERROR((AE_INFO, 326 ACPI_ERROR((AE_INFO,
326 "Could not signal Global Lock semaphore")); 327 "Could not signal Global Lock semaphore"));
327 } 328 }
@@ -447,7 +448,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
447 } 448 }
448 449
449 if (ACPI_FAILURE(status)) { 450 if (ACPI_FAILURE(status)) {
450 status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout); 451 status =
452 acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex,
453 timeout);
451 } 454 }
452 if (ACPI_FAILURE(status)) { 455 if (ACPI_FAILURE(status)) {
453 return_ACPI_STATUS(status); 456 return_ACPI_STATUS(status);