aboutsummaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2022-06-01 19:02:54 +0200
committerAntonio Borneo <borneo.antonio@gmail.com>2022-06-10 21:54:17 +0000
commitaee7c70a1a710ba8442b1aabff16d2f28eec2db2 (patch)
tree7d4c6d4f54296ac833507ae002c592ff03f82663 /src/target
parent63e22d5fb97fd99d88d840e88a25aff721e0424b (diff)
downloadriscv-openocd-aee7c70a1a710ba8442b1aabff16d2f28eec2db2.zip
riscv-openocd-aee7c70a1a710ba8442b1aabff16d2f28eec2db2.tar.gz
riscv-openocd-aee7c70a1a710ba8442b1aabff16d2f28eec2db2.tar.bz2
arm_adi_v5: fix scan-build warning [2/3]
Commit d01b3d69ec17 ("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 <borneo.antonio@gmail.com> Fixes: d01b3d69ec17 ("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 <vanekt@fbl.cz>
Diffstat (limited to 'src/target')
-rw-r--r--src/target/arm_adi_v5.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index f7b335d..0b11e81 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -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;