From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 1 Nov 2011 21:53:54 +0000 (+0100)
Subject: cortex_m: add missing error checking
X-Git-Tag: v0.6.0-rc1~480
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ea7a42e22b0a5df0fc9fd8b4db4b154cb4be228;p=openocd

cortex_m: add missing error checking

found by clang.

Change-Id: I099c6fe6b044dba36c20221cb439bdcba5a6bb6f
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/152
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>
---

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 8000b9a8..2a283cdb 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -124,16 +124,20 @@ static int cortexm3_dap_write_coreregister_u32(struct adiv5_dap *swjdp,
 	if (retval != ERROR_OK)
 		return retval;
 	retval = dap_queue_ap_write(swjdp, AP_REG_BD0 | (DCB_DCRDR & 0xC), value);
-	// XXX check retval
+	if (retval != ERROR_OK)
+		return retval;
 
 	/* mem_ap_write_u32(swjdp, DCB_DCRSR, i | DCRSR_WnR); */
 	retval = dap_setup_accessport(swjdp, CSW_32BIT | CSW_ADDRINC_OFF, DCB_DCRSR & 0xFFFFFFF0);
 	if (retval != ERROR_OK)
 		return retval;
 	retval = dap_queue_ap_write(swjdp, AP_REG_BD0 | (DCB_DCRSR & 0xC), regnum | DCRSR_WnR);
-	// XXX check retval
+	if (retval != ERROR_OK)
+		return retval;
 
 	retval = dap_run(swjdp);
+	if (retval != ERROR_OK)
+		return retval;
 
 	/* restore DCB_DCRDR - this needs to be in a seperate
 	 * transaction otherwise the emulated DCC channel breaks */