diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-25 02:10:36 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-25 02:10:36 -0400 |
| commit | aca209e5e654951a3a90f5aaa8e04e0c470993b4 (patch) | |
| tree | 5de472175d8edcbdf7a98022af7bf650bde761e9 /drivers/acpi/acpica/evmisc.c | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
| parent | 8df3fc981dc12d9fdcaef4100a2193b605024d7a (diff) | |
Merge branch 'acpica' into release
Conflicts:
drivers/acpi/acpica/aclocal.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/evmisc.c')
| -rw-r--r-- | drivers/acpi/acpica/evmisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c index df0aea9a8cfd..fcaed9fb44ff 100644 --- a/drivers/acpi/acpica/evmisc.c +++ b/drivers/acpi/acpica/evmisc.c | |||
| @@ -553,7 +553,7 @@ acpi_status acpi_ev_release_global_lock(void) | |||
| 553 | acpi_gbl_global_lock_acquired = FALSE; | 553 | acpi_gbl_global_lock_acquired = FALSE; |
| 554 | 554 | ||
| 555 | /* Release the local GL mutex */ | 555 | /* Release the local GL mutex */ |
| 556 | acpi_ev_global_lock_thread_id = NULL; | 556 | acpi_ev_global_lock_thread_id = 0; |
| 557 | acpi_ev_global_lock_acquired = 0; | 557 | acpi_ev_global_lock_acquired = 0; |
| 558 | acpi_os_release_mutex(acpi_gbl_global_lock_mutex->mutex.os_mutex); | 558 | acpi_os_release_mutex(acpi_gbl_global_lock_mutex->mutex.os_mutex); |
| 559 | return_ACPI_STATUS(status); | 559 | return_ACPI_STATUS(status); |