From 3875331b378a90c249fd0f97aed233c50743dc49 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 9 Dec 2009 17:14:14 +0000 Subject: [PATCH] As suggested by Ingo use the normal mutex_lock function in case of ACPI_WAIT_FOREVER. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34595 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/acpi/oshaiku.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c index 6f495a4e07..5277868978 100644 --- a/src/add-ons/kernel/bus_managers/acpi/oshaiku.c +++ b/src/add-ons/kernel/bus_managers/acpi/oshaiku.c @@ -1289,10 +1289,9 @@ AcpiOsAcquireMutex(ACPI_MUTEX handle, UINT16 timeout) ACPI_STATUS result = AE_OK; DEBUG_FUNCTION_VF("mutex: %ld; timeout: %u", handle, timeout); - if (timeout == ACPI_WAIT_FOREVER) { - result = mutex_lock_with_timeout(handle, 0, 0) - == B_OK ? AE_OK : AE_BAD_PARAMETER; - } else { + if (timeout == ACPI_WAIT_FOREVER) + result = mutex_lock(handle) == B_OK ? AE_OK : AE_BAD_PARAMETER; + else { switch (mutex_lock_with_timeout(handle, B_RELATIVE_TIMEOUT, (bigtime_t)timeout * 1000)) { case B_OK: