[PATCH] startup: Fix do_autoboot_countdown() running multiple times

[Sascha Hauer]

The comment above do_autoboot_countdown() states: "This function can be
called multiple times, it is executed only the first time.". Since
1973892533 ("startup: don't clobber original autoboot state") This is no
longer the case. Bring back the old and documented behaviour.

Fixes: 1973892533 ("startup: don't clobber original autoboot state")
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/startup.c | 5 ++++-
 include/common.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/startup.c b/common/startup.c
index 7e0f7d6b64..71a28a7be8 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -235,7 +235,7 @@ void set_autoboot_state(enum autoboot_state autoboot)
  */
 enum autoboot_state do_autoboot_countdown(void)
 {
-	enum autoboot_state autoboot_state;
+	static enum autoboot_state autoboot_state = AUTOBOOT_UNKNOWN;
 	unsigned flags = CONSOLE_COUNTDOWN_EXTERN;
 	int ret;
 	struct stat s;
@@ -243,6 +243,9 @@ enum autoboot_state do_autoboot_countdown(void)
 	char *abortkeys = NULL;
 	unsigned char outkey;
 
+	if (autoboot_state != AUTOBOOT_UNKNOWN)
+		return autoboot_state;
+
 	if (global_autoboot_state != AUTOBOOT_COUNTDOWN)
 		return global_autoboot_state;
 
diff --git a/include/common.h b/include/common.h
index ce16ff83af..ceb0b358bd 100644
--- a/include/common.h
+++ b/include/common.h
@@ -88,6 +88,7 @@ enum autoboot_state {
 	AUTOBOOT_ABORT,
 	AUTOBOOT_MENU,
 	AUTOBOOT_BOOT,
+	AUTOBOOT_UNKNOWN,
 };
 
 void set_autoboot_state(enum autoboot_state autoboot);
-- 
2.27.0