From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Fri, 1 Apr 2011 10:32:41 +0000 (+0200)
Subject: mips: fix gaffe in previous commit
X-Git-Tag: v0.5.0-rc1~114
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=a0b83e82f7fa1833f7ac137d052335c55d1a4223;hp=e1f5055bb089d1f854777da1d200e7551cdd3a4f

mips: fix gaffe in previous commit

accidentally invoked return jtag_execute_queue() in the
middle of a fn. Hmm.... I would have expected gcc or
at least lint to catch this.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 0ee5715dd2..2dc7a8fb98 100644
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -194,7 +194,10 @@ static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t ad
 	mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl);
 
 	jtag_add_clocks(5);
-	return jtag_execute_queue();
+	int retval;
+	retval = jtag_execute_queue();
+	if (retval != ERROR_OK)
+		return retval;
 
 	if ((address >= MIPS32_PRACC_PARAM_IN)
 		&& (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))