Skip to content

Commit

Permalink
arm_adi_v5: fix scan-build warning [2/3]
Browse files Browse the repository at this point in the history
Commit d01b3d6 ("arm_adi_v5: separate ROM table parsing from
command output [3/3]") introduces a new scan-build warning because
removing one return in case of error causes using uninitialized
values.

Add back the return on error.

Change-Id: I10ddc548b756d34aaccc0511f091b4caa5ec271a
Signed-off-by: Antonio Borneo <[email protected]>
Fixes: d01b3d6 ("arm_adi_v5: separate ROM table parsing from command output [3/3]")
Reviewed-on: https://review.openocd.org/c/openocd/+/7011
Tested-by: jenkins
Reviewed-by: Tomas Vanek <[email protected]>
  • Loading branch information
borneoa committed Jun 10, 2022
1 parent 63e22d5 commit aee7c70
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/target/arm_adi_v5.c
Original file line number Diff line number Diff line change
Expand Up @@ -1552,8 +1552,10 @@ static int rtp_rom_loop(const struct rtp_ops *ops,
}
if (retval == ERROR_OK)
retval = dap_run(ap->dap);
if (retval != ERROR_OK)
if (retval != ERROR_OK) {
LOG_DEBUG("Failed read ROM table entry");
return retval;
}

if (width == 64) {
romentry = (((uint64_t)romentry_high) << 32) | romentry_low;
Expand Down

0 comments on commit aee7c70

Please sign in to comment.