From: Simon Glass <sjg@chromium.org>
Date: Fri, 2 May 2025 14:46:51 +0000 (-0600)
Subject: expo: Adjust expo_poll() to avoid looping forever
X-Git-Tag: v2025.10-rc1~118^2~56^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bca4798971a1ea32c43994e35f63f1964b2ddf6;p=thirdparty%2Fu-boot.git

expo: Adjust expo_poll() to avoid looping forever

If the user does not quickly provide some input, exit so that other
things can be done, such as searching for the next OS.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/boot/expo.c b/boot/expo.c
index 7dbcac78c22..ee8ffaf8920 100644
--- a/boot/expo.c
+++ b/boot/expo.c
@@ -326,12 +326,14 @@ int expo_poll(struct expo *exp, struct expo_action *act)
 
 	ichar = cli_ch_process(&exp->cch, 0);
 	if (!ichar) {
-		while (!ichar && !tstc()) {
+		int i;
+
+		for (i = 0; i < 10 && !ichar && !tstc(); i++) {
 			schedule();
 			mdelay(2);
 			ichar = cli_ch_process(&exp->cch, -ETIMEDOUT);
 		}
-		if (!ichar) {
+		while (!ichar && tstc()) {
 			ichar = getchar();
 			ichar = cli_ch_process(&exp->cch, ichar);
 		}