X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fcortex_swjdp.c;h=dc50fea1c4a91ff18b64bb8c5f1d5338db447ee9;hb=e2b6de3d66bae70cb08fea17f5b66ee875dbb636;hp=d1983ec56e49767a50bec201ec282d3ca5796ea3;hpb=d47e1b8f362379d8a2307f49e2b42115a3f40524;p=openocd.git

diff --git a/src/target/cortex_swjdp.c b/src/target/cortex_swjdp.c
index d1983ec56e..dc50fea1c4 100644
--- a/src/target/cortex_swjdp.c
+++ b/src/target/cortex_swjdp.c
@@ -941,6 +941,7 @@ int ahbap_debugport_init(swjdp_common_t *swjdp)
 	u32 idreg, romaddr, dummy;
 	u32 ctrlstat;
 	int cnt = 0;
+	int retval;
 	
 	LOG_DEBUG(" ");
 	
@@ -955,14 +956,16 @@ int ahbap_debugport_init(swjdp_common_t *swjdp)
 
 	swjdp_write_dpacc(swjdp, swjdp->dp_ctrl_stat, DP_CTRL_STAT);
 	swjdp_read_dpacc(swjdp, &ctrlstat, DP_CTRL_STAT);
-	jtag_execute_queue();
+	if ((retval=jtag_execute_queue())!=ERROR_OK)
+		return retval;
 
 	/* Check that we have debug power domains activated */
 	while (!(ctrlstat & CDBGPWRUPACK) && (cnt++ < 10))
 	{
 		LOG_DEBUG("swjdp: wait CDBGPWRUPACK");
 		swjdp_read_dpacc(swjdp, &ctrlstat, DP_CTRL_STAT);
-		jtag_execute_queue();
+		if ((retval=jtag_execute_queue())!=ERROR_OK)
+			return retval;
 		usleep(10000);
 	}
 
@@ -970,7 +973,8 @@ int ahbap_debugport_init(swjdp_common_t *swjdp)
 	{
 		LOG_DEBUG("swjdp: wait CSYSPWRUPACK");
 		swjdp_read_dpacc(swjdp, &ctrlstat, DP_CTRL_STAT);
-		jtag_execute_queue();
+		if ((retval=jtag_execute_queue())!=ERROR_OK)
+			return retval;
 		usleep(10000);
 	}