arm_adi_v5: fix scan-build warning [1/3]

[openocd.git] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 24de3053020f752e8ddb6e4b29f083851468bcad..f7b335d95c5d08e3ff3df516e8f02c50e72d8897 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1641,11 +1641,12 @@ static int rtp_ap(const struct rtp_ops *ops, struct adiv5_ap *ap)
 {
        int retval;
        uint32_t apid;
-       target_addr_t dbgbase = 0; /* GCC complains can be used uninitialized */
-       target_addr_t invalid_entry;
+       target_addr_t dbgbase, invalid_entry;
 
        /* Now we read ROM table ID registers, ref. ARM IHI 0029B sec  */
        retval = dap_get_debugbase(ap, &dbgbase, &apid);
+       if (retval != ERROR_OK)
+               return retval;
        retval = rtp_ops_mem_ap_header(ops, retval, ap, dbgbase, apid);
        if (retval != ERROR_OK)
                return retval;