diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-07-20 08:23:59 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-07-20 08:24:53 +0200 |
| commit | e0525cd182aee35549f13e786143ccc0a252aeab (patch) | |
| tree | 51f6cb173c4299e2d95f757396c8a0f0918162fa /src/target/arm920t.c | |
| parent | a9761c90931101d280b9443126db017f96d92e3d (diff) | |
| download | openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.tar.gz openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.tar.bz2 openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.tar.xz openocd+libswd-e0525cd182aee35549f13e786143ccc0a252aeab.zip | |
arm_jtag_scann error propagation fixes
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/target/arm920t.c')
| -rw-r--r-- | src/target/arm920t.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/target/arm920t.c b/src/target/arm920t.c index c5064c11..90f548f3 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -93,7 +93,9 @@ static int arm920t_read_cp15_physical(struct target *target, jtag_info = &arm920t->arm7_9_common.jtag_info; - arm_jtag_scann(jtag_info, 0xf, TAP_IDLE); + retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) return retval; @@ -146,7 +148,9 @@ static int arm920t_write_cp15_physical(struct target *target, buf_set_u32(value_buf, 0, 32, value); - arm_jtag_scann(jtag_info, 0xf, TAP_IDLE); + retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) return retval; @@ -197,7 +201,9 @@ static int arm920t_execute_cp15(struct target *target, uint32_t cp15_opcode, jtag_info = &arm920t->arm7_9_common.jtag_info; - arm_jtag_scann(jtag_info, 0xf, TAP_IDLE); + retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE); + if (retval != ERROR_OK) + return retval; retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE); if (retval != ERROR_OK) return retval; |