From 6503eb21c6043b74a4a92d9b92057cbf45b6f313 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Tue, 30 Nov 2021 17:03:08 +0100 Subject: scripts/kwboot: Fix normalizing timeval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If tv.tv_usec is 1000000 the structure needs normalizing, too. So the right check would be: if (tv.tv_usec >= 1000000) { ... But as normalizing doesn't destroy anything even for smaller values, just do it unconditionally to simplify a bit. Signed-off-by: Uwe Kleine-König Link: https://lore.barebox.org/20211130160308.316863-1-u.kleine-koenig@pengutronix.de Signed-off-by: Sascha Hauer --- scripts/kwboot.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/kwboot.c b/scripts/kwboot.c index 60e8a69d18..1cbb456935 100644 --- a/scripts/kwboot.c +++ b/scripts/kwboot.c @@ -147,12 +147,11 @@ kwboot_tty_recv(int fd, void *buf, size_t len, int timeo) FD_ZERO(&rfds); FD_SET(fd, &rfds); - tv.tv_sec = 0; tv.tv_usec = timeo * 1000; - if (tv.tv_usec > 1000000) { - tv.tv_sec += tv.tv_usec / 1000000; - tv.tv_usec %= 1000000; - } + + /* normalize timeval */ + tv.tv_sec = tv.tv_usec / 1000000; + tv.tv_usec %= 1000000; do { nfds = select(fd + 1, &rfds, NULL, NULL, &tv); -- cgit v1.2.3