From 8700b4da0e6ff96068090e632d4369a86f526b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 24 Nov 2017 15:40:24 +0100 Subject: [PATCH] firstboot: remove some unnecessary code (#7456) Inspired by #7449. --- src/firstboot/firstboot.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 1435880fab..afbfa3743d 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -314,14 +314,8 @@ static int prompt_keymap(void) { putchar('\n'); - r = prompt_loop("Please enter system keymap name or number", kmaps, keymap_is_valid, &arg_keymap); - if (r < 0) - return r; - - if (isempty(arg_keymap)) - return 0; - - return 0; + return prompt_loop("Please enter system keymap name or number", + kmaps, keymap_is_valid, &arg_keymap); } static int process_keymap(void) {