| Message ID | 20240308165937.270499-2-colin.mcallister@garmin.com |
|---|---|
| State | Superseded |
| Delegated to: | Mattijs Korpershoek |
| Headers | show |
| Series | Fix Android A/B backup | expand |
On Fri, Mar 8, 2024 at 11:00 AM Colin McAllister <colin.mcallister@garmin.com> wrote: > > Found a missing semicolon in code protected by a #if that will never > evaluate to true due to a separate issue. Fixing this issue before > addressing the #if. > > Fixes: 3430f24bc6 ("android_ab: Try backup booloader_message") > Signed-off-by: Colin McAllister <colin.mcallister@garmin.com> > Cc: Joshua Watt <JPEWhacker@gmail.com> > Cc: Simon Glass <sjg@chromium.org> > --- My R-b tag wasn't added in v3, adding it here so that whoever applies this patch can add it as well: Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> > v2: No changes > v3: Added "Fixes:" tag > > boot/android_ab.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/android_ab.c b/boot/android_ab.c > index c9df6d2b4b..9a3d15ec60 100644 > --- a/boot/android_ab.c > +++ b/boot/android_ab.c > @@ -221,7 +221,7 @@ int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, > #if ANDROID_AB_BACKUP_OFFSET > crc32_le = ab_control_compute_crc(backup_abc); > if (backup_abc->crc32_le != crc32_le) { > - log_err("ANDROID: Invalid backup CRC-32 ") > + log_err("ANDROID: Invalid backup CRC-32 "); > log_err("expected %.8x, found %.8x),", > crc32_le, backup_abc->crc32_le); > #endif > -- > 2.43.2 > > > ________________________________ > > CONFIDENTIALITY NOTICE: This email and any attachments are for the sole use of the intended recipient(s) and contain information that may be Garmin confidential and/or Garmin legally privileged. If you have received this email in error, please notify the sender by reply email and delete the message. Any disclosure, copying, distribution or use of this communication (including attachments) by someone other than the intended recipient is prohibited. Thank you.
diff --git a/boot/android_ab.c b/boot/android_ab.c index c9df6d2b4b..9a3d15ec60 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -221,7 +221,7 @@ int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, #if ANDROID_AB_BACKUP_OFFSET crc32_le = ab_control_compute_crc(backup_abc); if (backup_abc->crc32_le != crc32_le) { - log_err("ANDROID: Invalid backup CRC-32 ") + log_err("ANDROID: Invalid backup CRC-32 "); log_err("expected %.8x, found %.8x),", crc32_le, backup_abc->crc32_le); #endif
Found a missing semicolon in code protected by a #if that will never evaluate to true due to a separate issue. Fixing this issue before addressing the #if. Fixes: 3430f24bc6 ("android_ab: Try backup booloader_message") Signed-off-by: Colin McAllister <colin.mcallister@garmin.com> Cc: Joshua Watt <JPEWhacker@gmail.com> Cc: Simon Glass <sjg@chromium.org> --- v2: No changes v3: Added "Fixes:" tag boot/android_ab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.43.2