X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=64b4342ca2212ef0744440e705c6b6bf1e3692c5;hp=1d4b3e2c161534d33189f59b58743851013abfb9;hb=bdd893377fe65519fae90948cd8f3c635757eaba;hpb=88c4e720317845a8e01aee03f142ba82674cd23d

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 1d4b3e2c..64b4342c 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -10,15 +10,10 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
 {
 	while (sem_trywait(sem)) {
 		int r;
-		if (at && at->tv_nsec >= 1000000000UL) {
-			errno = EINVAL;
-			return -1;
-		}
 		a_inc(sem->__val+1);
 		a_cas(sem->__val, 0, -1);
-		pthread_cleanup_push(cleanup, sem->__val+1);
-		r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, 0);
-		pthread_cleanup_pop(1);
+		r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, 0);
+		a_dec(sem->__val+1);
 		if (r) {
 			errno = r;
 			return -1;