From 4bc3decf8743c0add93d434a639bb1b449b6da11 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 17 Jun 2017 11:39:24 +0200 Subject: [PATCH] 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 --- uloop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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)