aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/events/evxface.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-05-09 22:56:38 -0400
committerLen Brown <len.brown@intel.com>2007-05-09 22:56:38 -0400
commit4d2acd9ea539e0f59178b126f6750ccc41eefcdd (patch)
tree6d9e47c9ab33a1ce2c02139b6bf5c029c2abad32 /drivers/acpi/events/evxface.c
parentb5f0adbcc4f16e378882d8f68fe3111df04911be (diff)
Revert "ACPICA: revert "acpi_serialize" changes"
This reverts commit a8f4af6dc6600980885c594f52eecd60edd62013. Thus restoring ACPICA's new acpi_serialize code. This commit by itself may cause a regression, but it is reverted in this order so that subsequent reverts reverts under this one can be made without conflict. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/events/evxface.c')
-rw-r--r--drivers/acpi/events/evxface.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index a3379bafa67..685a103a358 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -768,11 +768,9 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
return (AE_BAD_PARAMETER);
}
- status = acpi_ex_enter_interpreter();
- if (ACPI_FAILURE(status)) {
- return (status);
- }
+ /* Must lock interpreter to prevent race conditions */
+ acpi_ex_enter_interpreter();
status = acpi_ev_acquire_global_lock(timeout);
acpi_ex_exit_interpreter();