1 files changed, 2 insertions, 6 deletions

diff --git a/firmware/kernel/semaphore.c b/firmware/kernel/semaphore.c
index f9ff0ad987..b6ce7fd742 100644
--- a/firmware/kernel/semaphore.c
+++ b/firmware/kernel/semaphore.c
@@ -82,11 +82,7 @@ int semaphore_wait(struct semaphore *s, int timeout)
          * explicit in semaphore_release */
         current->retval = OBJ_WAIT_TIMEDOUT;
 
-        if(timeout > 0)
-            block_thread_w_tmo(current, timeout); /* ...or timed out... */
-        else
-            block_thread(current);                /* -timeout = infinite */
-
+        block_thread(current, timeout);
         corelock_unlock(&s->cl);
 
         /* ...and turn control over to next thread */
@@ -118,7 +114,7 @@ void semaphore_release(struct semaphore *s)
         KERNEL_ASSERT(s->count == 0,
             "semaphore_release->threads queued but count=%d!\n", s->count);
         s->queue->retval = OBJ_WAIT_SUCCEEDED; /* indicate explicit wake */
-        result = wakeup_thread(&s->queue);
+        result = wakeup_thread(&s->queue, WAKEUP_DEFAULT);
     }
     else
     {