Fredrik Hederstierna: fix leak + clean up return codes

git-svn-id: svn://svn.berlios.de/openocd/trunk@697 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 150f0f87353ce985da600ffb26196c88c77fcbbe..2904d565f3a82d6186b399281a5d2ad51732b741 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -325,7 +325,7 @@ int str9x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
        u32 address = bank->base + offset;
        reg_param_t reg_params[4];
        armv4_5_algorithm_t armv4_5_info;
-       int retval;
+       int retval = ERROR_OK;
        
        u32 str9x_flash_write_code[] = {
                                        /* write:                               */
@@ -400,12 +400,13 @@ int str9x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
                        target_free_working_area(target, source);
                        target_free_working_area(target, str9x_info->write_algorithm);
                        LOG_ERROR("error executing str9x flash write algorithm");
-                       return ERROR_FLASH_OPERATION_FAILED;
+                       break;
                }
        
                if (buf_get_u32(reg_params[3].value, 0, 32) != 0x80)
                {
-                       return ERROR_FLASH_OPERATION_FAILED;
+                       retval = ERROR_FLASH_OPERATION_FAILED;
+                        break;
                }
                
                buffer += thisrun_count * 2;
@@ -421,7 +422,7 @@ int str9x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
        destroy_reg_param(&reg_params[2]);
        destroy_reg_param(&reg_params[3]);
        
-       return ERROR_OK;
+       return retval;
 }
 
 int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)