]> git.sur5r.net Git - openocd/commitdiff
mips: fix gaffe in previous commit
authorØyvind Harboe <oyvind.harboe@zylin.com>
Fri, 1 Apr 2011 10:32:41 +0000 (12:32 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Fri, 1 Apr 2011 10:32:41 +0000 (12:32 +0200)
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>
src/target/mips32_pracc.c

index 0ee5715dd299811cbc7d991053068f709f9635d6..2dc7a8fb982f37f8d6ba9725ee7560e91036a4a3 100644 (file)
@@ -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);
        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))
 
        if ((address >= MIPS32_PRACC_PARAM_IN)
                && (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))