[Openocd-development] openocd patch: 20f3092 cortex_a: add missing error propagation

[gerrit]

This is an automated email from Gerrit.

?yvind Harboe (oyvindhar...@gmail.com) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/153

-- gerrit

commit 20f3092a5c78c284fa4da3fe1816610c8cdaab13
Author: Øyvind Harboe <oyvind.har...@zylin.com>
Date:   Tue Nov 1 22:56:28 2011 +0100

    cortex_a: add missing error propagation
    
    found by clang.
    
    Change-Id: I50eac219d7540fd48d3285f3f213cb659492d0c0
    Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>

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);
 

-- 

_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development