summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@chromium.org>2017-12-12 07:11:18 +0000
committerPhilip Chen <philipchen@chromium.org>2017-12-12 19:58:16 +0000
commitc5c1c679dee34f6e3b3e661182a83c3eb728ecda (patch)
tree553fc86d9bcc095064f7517c9252346ecd7a90df
parentdff5852c2f41c240842b49549b212c36287d5e26 (diff)
downloadvboot-c5c1c679dee34f6e3b3e661182a83c3eb728ecda.tar.gz
Revert "vboot: Fix INSERT screen error when valid Kernel USB is not inserted"
BUG=b:70538502 BRANCH=none TEST=enter VB_MENU_TO_DEV reliably This reverts commit 805726997cc7c3a95b1fd24de5e6909712e4f11c. Change-Id: I08a29084ac9ae53794fd5c44128e06ad6e2faea9 Reviewed-on: https://chromium-review.googlesource.com/822050 Reviewed-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Commit-Queue: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org>
-rw-r--r--firmware/lib/vboot_ui_menu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index d1c2b1d3..bcdcd0fc 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -1048,10 +1048,8 @@ static VbError_t recovery_ui(struct vb2_context *ctx, VbCommonParams *cparams)
if (current_menu != VB_MENU_RECOVERY ||
current_menu_idx != VB_RECOVERY_DBG_INFO) {
- if (retval == VBERROR_NO_DISK_FOUND) {
- current_menu = VB_MENU_RECOVERY_INSERT;
+ if (retval == VBERROR_NO_DISK_FOUND)
vb2_draw_current_screen(ctx, cparams);
- }
else {
VbDisplayScreen(ctx, cparams,
VB_SCREEN_RECOVERY_NO_GOOD,