summaryrefslogtreecommitdiff
path: root/firmware/lib/ec_sync_all.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/lib/ec_sync_all.c')
-rw-r--r--firmware/lib/ec_sync_all.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/firmware/lib/ec_sync_all.c b/firmware/lib/ec_sync_all.c
index 45da682b..09727152 100644
--- a/firmware/lib/ec_sync_all.c
+++ b/firmware/lib/ec_sync_all.c
@@ -46,19 +46,12 @@ VbError_t ec_sync_all(struct vb2_context *ctx, struct VbCommonParams *cparams)
VbAuxFwUpdateSeverity_t fw_update;
VbError_t rv;
- /* Do EC sync phase 1; this determines if we need an update */
- VbError_t phase1_rv = ec_sync_phase1(ctx, cparams);
-
- /*
- * Check for AUX firmware updates to be performed.
- * Continue on errors to prevent reboot loop on persistent failure.
- */
rv = ec_sync_check_aux_fw(ctx, cparams, &fw_update);
- if (rv) {
- VB2_DEBUG("Skipping AUX FW update.\n");
- fw_update = VB_AUX_FW_NO_UPDATE;
- }
+ if (rv)
+ return rv;
+ /* Do EC sync phase 1; this determines if we need an update */
+ VbError_t phase1_rv = ec_sync_phase1(ctx, cparams);
int need_wait_screen = ec_will_update_slowly(ctx, cparams) ||
(fw_update == VB_AUX_FW_SLOW_UPDATE);