diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2012-01-27 10:45:02 -0800 |
|---|---|---|
| committer | Stefan Reinauer <reinauer@chromium.org> | 2012-01-27 10:56:47 -0800 |
| commit | ff4554c486860c9ed172e2306c0952dd00651822 (patch) | |
| tree | 293f7b85910f8a58a02c67d8a62341526b15890e | |
| parent | 82dd9612e02b35996b1ace5f52f0c9db12c4107a (diff) | |
| download | vboot-ff4554c486860c9ed172e2306c0952dd00651822.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.
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>
(cherry picked from commit cbfc6dbd231828b0327583447f5192334ebd4101)
Change-Id: I0432229673cd11a7eb247892c213c1acb0fe6e64
Reviewed-on: https://gerrit.chromium.org/gerrit/14965
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 1 |
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; } |