[U-Boot] [PATCH v2] common, menu: do not timeout again if an item was selected but not found

Heiko Schocher hs at denx.de
Wed Jan 18 07:18:11 CET 2012


Signed-off-by: Heiko Schocher <hs at denx.de>
Acked-by: Jason Hobbs <jason.hobbs at calxeda.com>
Cc: Mike Frysinger <vapier at gentoo.org>

---
- changes for v2:
  - add Acked-by from Jason Hobbs <jason.hobbs at calxeda.com>
  - add comment from Mike Frysinger:
    - respell summary text
---
 common/menu.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/common/menu.c b/common/menu.c
index 754a9f9..aa16c9a 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -236,8 +236,10 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
 		if (readret >= 0) {
 			choice_item = menu_item_by_key(m, cbuf);
 
-			if (!choice_item)
+			if (!choice_item) {
 				printf("%s not found\n", cbuf);
+				m->timeout = 0;
+			}
 		} else {
 			puts("^C\n");
 			return -EINTR;
-- 
1.7.7.5



More information about the U-Boot mailing list