summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2011-04-01 12:32:41 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2011-04-01 12:32:41 +0200
commita0b83e82f7fa1833f7ac137d052335c55d1a4223 (patch)
treedf25ef8a463ec2fddcae08d0a966e0ce95ca00bb /src
parente1f5055bb089d1f854777da1d200e7551cdd3a4f (diff)
downloadopenocd+libswd-a0b83e82f7fa1833f7ac137d052335c55d1a4223.tar.gz
openocd+libswd-a0b83e82f7fa1833f7ac137d052335c55d1a4223.tar.bz2
openocd+libswd-a0b83e82f7fa1833f7ac137d052335c55d1a4223.tar.xz
openocd+libswd-a0b83e82f7fa1833f7ac137d052335c55d1a4223.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/target/mips32_pracc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 0ee5715d..2dc7a8fb 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))