From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 17 Jun 2017 09:39:24 +0000 (+0200)
Subject: uloop: fix a regression in timeout handling
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=4bc3decf8743c0add93d434a639bb1b449b6da11;hp=6a7fb7d8df308d18167051447fa489de389588df

uloop: fix a regression in timeout handling

Variable confusion was breaking timers

Fixes: 368fd2645878 ("uloop: allow specifying a timeout for uloop_run()")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/uloop.c b/uloop.c
index f503241..0c57753 100644
--- a/uloop.c
+++ b/uloop.c
@@ -548,9 +548,9 @@ int uloop_run_timeout(int timeout)
 		uloop_gettime(&tv);
 
 		next_time = uloop_get_next_timeout(&tv);
-		if (timeout > 0 && next_time < timeout)
-			timeout = next_time;
-		uloop_run_events(timeout);
+		if (timeout > 0 && timeout < next_time)
+			next_time = timeout;
+		uloop_run_events(next_time);
 	}
 
 	if (!--uloop_run_depth)