From: Heiko Schocher <hs@denx.de>
Date: Mon, 16 Jan 2012 22:24:29 +0000 (+0000)
Subject: common, menu: do not trigger timeout again, if a line is read
X-Git-Tag: v2012.04-rc1~230
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc4fa6a16db3f5c5671b4f3d32359fa416542cd2;p=u-boot

common, menu: do not trigger timeout again, if a line is read

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Jason Hobbs <jason.hobbs@calxeda.com>
Acked-by: Jason Hobbs <jason.hobbs@calxeda.com>
---

diff --git a/common/menu.c b/common/menu.c
index 754a9f9d06..aa16c9a199 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;