From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Mon, 12 Oct 2009 13:25:00 +0000 (+0200)
Subject: More error propagation fixes.
X-Git-Tag: v0.3.0-rc0~101
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=85398ccdcf251241c56502b3e4897df7e7e48eb5;p=openocd

More error propagation fixes.
---

diff --git a/src/target/arm11.c b/src/target/arm11.c
index f7265dac..36ed6b8e 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1401,7 +1401,9 @@ int arm11_write_memory_inner(struct target_s *target, uint32_t address, uint32_t
 
 	arm11_common_t * arm11 = target->arch_info;
 
-	arm11_run_instr_data_prepare(arm11);
+	retval = arm11_run_instr_data_prepare(arm11);
+	if (retval != ERROR_OK)
+		return retval;
 
 	/* MRC p14,0,r0,c0,c5,0 */
 	retval = arm11_run_instr_data_to_core1(arm11, 0xee100e15, address);
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 1ab6c524..57685cfd 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -925,7 +925,10 @@ void arm11_sc7_set_vcr(arm11_common_t * arm11, uint32_t value)
  */
 int arm11_read_memory_word(arm11_common_t * arm11, uint32_t address, uint32_t * result)
 {
-	arm11_run_instr_data_prepare(arm11);
+	int retval;
+	retval = arm11_run_instr_data_prepare(arm11);
+	if (retval != ERROR_OK)
+		return retval;
 
 	/* MRC p14,0,r0,c0,c5,0 (r0 = address) */
 	CHECK_RETVAL(arm11_run_instr_data_to_core1(arm11, 0xee100e15, address));
@@ -933,9 +936,7 @@ int arm11_read_memory_word(arm11_common_t * arm11, uint32_t address, uint32_t *
 	/* LDC p14,c5,[R0],#4 (DTR = [r0]) */
 	CHECK_RETVAL(arm11_run_instr_data_from_core(arm11, 0xecb05e01, result, 1));
 
-	arm11_run_instr_data_finish(arm11);
-
-	return ERROR_OK;
+	return arm11_run_instr_data_finish(arm11);
 }