aboutsummaryrefslogtreecommitdiff
path: root/src/target/cortex_a.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2011-11-01 22:56:28 +0100
committerSpencer Oliver <spen@spen-soft.co.uk>2011-11-02 09:43:04 +0000
commit2c906384c343215c3863e31ed0ac3fefcaad860f (patch)
treea42412821666ba86e9498059c1d476a27bc8a2c8 /src/target/cortex_a.c
parent5f00c007cb93b2d99a54b60406a659f671b69b81 (diff)
downloadriscv-openocd-2c906384c343215c3863e31ed0ac3fefcaad860f.zip
riscv-openocd-2c906384c343215c3863e31ed0ac3fefcaad860f.tar.gz
riscv-openocd-2c906384c343215c3863e31ed0ac3fefcaad860f.tar.bz2
cortex_a: add missing error propagation
found by clang. Change-Id: I50eac219d7540fd48d3285f3f213cb659492d0c0 Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com> Reviewed-on: http://openocd.zylin.com/153 Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/target/cortex_a.c')
-rwxr-xr-xsrc/target/cortex_a.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 2370d95..8a1ca3b 100755
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -1021,6 +1021,8 @@ static int cortex_a8_internal_restore(struct target *target, int current,
/* called it now before restoring context because it uses cpu
* register r0 for restoring cp15 control register */
retval = cortex_a8_restore_cp15_control_reg(target);
+ if (retval != ERROR_OK)
+ return retval;
retval = cortex_a8_restore_context(target, handle_breakpoints);
if (retval != ERROR_OK)
return retval;
@@ -1147,7 +1149,9 @@ static int cortex_a8_resume(struct target *target, int current,
cortex_a8_internal_restore(target, current, &address, handle_breakpoints, debug_execution);
if (target->smp)
{ target->gdb_service->core[0] = -1;
- retval += cortex_a8_restore_smp(target, handle_breakpoints);
+ retval = cortex_a8_restore_smp(target, handle_breakpoints);
+ if (retval != ERROR_OK)
+ return retval;
}
cortex_a8_internal_restart(target);