aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/events/evxface.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-03 01:08:52 -0500
committerLen Brown <len.brown@intel.com>2007-02-03 01:08:52 -0500
commite8bdc5a9c56c140c732246a298922c3cf3777460 (patch)
treedfdbf3a5597dfc5b29324a4dcb303839504cd88e /drivers/acpi/events/evxface.c
parentc6f4bc211122c86de85a6c93f139319957fd1f8a (diff)
parentb0b7eaaf0c7aefd118d3ff8640fbed75a9fad9a1 (diff)
Pull acpica into test branch
Diffstat (limited to 'drivers/acpi/events/evxface.c')
-rw-r--r--drivers/acpi/events/evxface.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 923fd2b4695..685a103a358 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -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();