diff options
Diffstat (limited to 'drivers/acpi/events/evxface.c')
| -rw-r--r-- | drivers/acpi/events/evxface.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c index a3379bafa676..6d866a01f5f4 100644 --- a/drivers/acpi/events/evxface.c +++ b/drivers/acpi/events/evxface.c | |||
| @@ -91,7 +91,6 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler) | |||
| 91 | 91 | ||
| 92 | ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) | 92 | ACPI_EXPORT_SYMBOL(acpi_install_exception_handler) |
| 93 | #endif /* ACPI_FUTURE_USAGE */ | 93 | #endif /* ACPI_FUTURE_USAGE */ |
| 94 | |||
| 95 | /******************************************************************************* | 94 | /******************************************************************************* |
| 96 | * | 95 | * |
| 97 | * FUNCTION: acpi_install_fixed_event_handler | 96 | * FUNCTION: acpi_install_fixed_event_handler |
| @@ -768,11 +767,9 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle) | |||
| 768 | return (AE_BAD_PARAMETER); | 767 | return (AE_BAD_PARAMETER); |
| 769 | } | 768 | } |
| 770 | 769 | ||
| 771 | status = acpi_ex_enter_interpreter(); | 770 | /* Must lock interpreter to prevent race conditions */ |
| 772 | if (ACPI_FAILURE(status)) { | ||
| 773 | return (status); | ||
| 774 | } | ||
| 775 | 771 | ||
| 772 | acpi_ex_enter_interpreter(); | ||
| 776 | status = acpi_ev_acquire_global_lock(timeout); | 773 | status = acpi_ev_acquire_global_lock(timeout); |
| 777 | acpi_ex_exit_interpreter(); | 774 | acpi_ex_exit_interpreter(); |
| 778 | 775 | ||
