summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2012-01-27 10:45:02 -0800
committerStefan Reinauer <reinauer@chromium.org>2012-01-27 10:54:19 -0800
commitcbfc6dbd231828b0327583447f5192334ebd4101 (patch)
treeb07693aeeaf0f47c72f30b5ab3d71602f40d7b62
parentb5cf3f30ccd5f26bdce4ae03bec8dcad4d70b37f (diff)
downloadvboot-cbfc6dbd231828b0327583447f5192334ebd4101.tar.gz
Oops. Must still distinguish "no disks" from "no valid disks".
The fix for chrome-os-partner:7715 introduced a new bug. This fixes that. BUG=chrome-os-partner:7775 TEST=manual Boot into recovery mode. Insert invalid USB. You should see the YUCK screen. Change-Id: I868287eecd34bb0c48127bee04f573b418f5945c Reviewed-on: https://gerrit.chromium.org/gerrit/14963 Commit-Ready: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
-rw-r--r--firmware/lib/vboot_api_kernel.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index bcb3d232..3df978f6 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -96,7 +96,6 @@ uint32_t VbTryLoadKernel(VbCommonParams* cparams, LoadKernelParams* p,
/* If we didn't succeed, don't return a disk handle */
if (VBERROR_SUCCESS != retval) {
VbSetRecoveryRequest(VBNV_RECOVERY_RW_NO_DISK);
- retval = VBERROR_NO_DISK_FOUND;
p->disk_handle = NULL;
}