summaryrefslogtreecommitdiff
path: root/src/target/mips_ejtag.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2011-03-31 23:07:55 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2011-03-31 23:08:53 +0200
commite1f5055bb089d1f854777da1d200e7551cdd3a4f (patch)
treea5fc7982b2533b375dc0d6e741713193d0ad6fab /src/target/mips_ejtag.c
parentf169f86bd10c4dfdab6088e233647bb6d42b5c26 (diff)
downloadopenocd+libswd-e1f5055bb089d1f854777da1d200e7551cdd3a4f.tar.gz
openocd+libswd-e1f5055bb089d1f854777da1d200e7551cdd3a4f.tar.bz2
openocd+libswd-e1f5055bb089d1f854777da1d200e7551cdd3a4f.tar.xz
openocd+libswd-e1f5055bb089d1f854777da1d200e7551cdd3a4f.zip
mips: fix error handling for jtag_execute_queue()
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/mips_ejtag.c')
-rw-r--r--src/target/mips_ejtag.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index e3810639..6ce702fd 100644
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -64,11 +64,12 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode)
jtag_add_dr_scan(ejtag_info->tap, 1, &field, TAP_IDLE);
- if (jtag_execute_queue() != ERROR_OK)
+ int retval;
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("register read failed");
+ return retval;
}
-
return ERROR_OK;
}
@@ -84,11 +85,12 @@ static int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impco
jtag_add_dr_scan(ejtag_info->tap, 1, &field, TAP_IDLE);
- if (jtag_execute_queue() != ERROR_OK)
+ int retval;
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("register read failed");
+ return retval;
}
-
return ERROR_OK;
}