diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2002-07-09 17:54:02 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2002-07-09 17:54:02 +0000 |
commit | 57bb0b6ca49cdd01098ab04fda81a87197188825 (patch) | |
tree | dfd1e75d9d7a42530736716ee1fc7c35f267f753 /sys/contrib/dev/acpica/exsystem.c | |
parent | 900789083d83b1bdef94797be7ef6652e6900546 (diff) | |
download | FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.zip FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.tar.gz |
Resolve conflicts arising from the ACPI CA 20020611 import.
Diffstat (limited to 'sys/contrib/dev/acpica/exsystem.c')
-rw-r--r-- | sys/contrib/dev/acpica/exsystem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/contrib/dev/acpica/exsystem.c b/sys/contrib/dev/acpica/exsystem.c index 758567b..5b7230a 100644 --- a/sys/contrib/dev/acpica/exsystem.c +++ b/sys/contrib/dev/acpica/exsystem.c @@ -119,8 +119,6 @@ #include "acpi.h" #include "acinterp.h" -#include "acnamesp.h" -#include "achware.h" #include "acevents.h" #define _COMPONENT ACPI_EXECUTER @@ -347,8 +345,8 @@ AcpiExSystemReleaseMutex ( */ if (ObjDesc->Mutex.Semaphore == AcpiGbl_GlobalLockSemaphore) { - AcpiEvReleaseGlobalLock (); - return_ACPI_STATUS (AE_OK); + Status = AcpiEvReleaseGlobalLock (); + return_ACPI_STATUS (Status); } Status = AcpiOsSignalSemaphore (ObjDesc->Mutex.Semaphore, 1); @@ -454,7 +452,7 @@ AcpiExSystemResetEvent ( Status = AcpiOsCreateSemaphore (ACPI_NO_UNIT_LIMIT, 0, &TempSemaphore); if (ACPI_SUCCESS (Status)) { - AcpiOsDeleteSemaphore (ObjDesc->Event.Semaphore); + (void) AcpiOsDeleteSemaphore (ObjDesc->Event.Semaphore); ObjDesc->Event.Semaphore = TempSemaphore; } |