From 21c97b16cf49f7b289f100420ed77b2d022f4850 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 5 Oct 2017 16:01:01 -0600 Subject: [PATCH] Revert "sem_wait.c edited online with Bitbucket. Fix some correct but useless code." What was I thinking? I missed that litle minus sign and the possibility that the errno might be some positive non-zero value. This reverts commit 43880878e4f2d317d4ddb589061d9bfb6d71fbca. --- sched/semaphore/sem_wait.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sched/semaphore/sem_wait.c b/sched/semaphore/sem_wait.c index 7f2bcfb57bf..5b2b8ceb5d8 100644 --- a/sched/semaphore/sem_wait.c +++ b/sched/semaphore/sem_wait.c @@ -187,7 +187,7 @@ int nxsem_wait(FAR sem_t *sem) * race conditions. */ - /* An error may have occurred while we were sleeping. Expected + /* Check if an error occurred while we were sleeping. Expected * errors include EINTR meaning that we were awakened by a signal * or ETIMEDOUT meaning that the timer expired for the case of * sem_timedwait(). @@ -197,7 +197,7 @@ int nxsem_wait(FAR sem_t *sem) * thread was restarted. */ - ret = rtcb->pterrno; + ret = rtcb->pterrno != OK ? -rtcb->pterrno : OK; rtcb->pterrno = saved_errno; #ifdef CONFIG_PRIORITY_INHERITANCE