Changeset 132ab5d1 in mainline for kernel/generic/src/synch/semaphore.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/synch/semaphore.c (modified) (1 diff)

kernel/generic/src/synch/semaphore.c

@@ -73 +73 @@
 int _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned int flags)
 {
-        return waitq_sleep_timeout(&sem->wq, usec, flags);
+        return waitq_sleep_timeout(&sem->wq, usec, flags, NULL);
 }