summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-08-11 13:15:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-08-11 13:15:08 +0200
commit157947b7046b26631005417780fa034ef6f14ea2 (patch)
tree5dbed87a817944aef466e0691b2135e0d9c8836d
parent243611936c5f9d10de88f21613dc9768d1e9b867 (diff)
parent804d876dc202c75a89255353d70d3e8aa5bfe460 (diff)
downloadbarebox-next.tar.gz
Merge branch 'for-next/misc' into nextnext
-rw-r--r--common/console_countdown.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/console_countdown.c b/common/console_countdown.c
index 74dc382..b92948f 100644
--- a/common/console_countdown.c
+++ b/common/console_countdown.c
@@ -64,7 +64,7 @@ int console_countdown(int timeout_s, unsigned flags, const char *keys,
goto out;
if (flags & CONSOLE_COUNTDOWN_ANYKEY)
goto out;
- if (flags & CONSOLE_COUNTDOWN_RETURN && key == '\n')
+ if (flags & CONSOLE_COUNTDOWN_RETURN && (key == '\n' || key == '\r'))
goto out;
if (flags & CONSOLE_COUNTDOWN_CTRLC && key == 3)
goto out;