- "flash write_binary" is now "flash write_bank" to clarify the focus of the

[openocd.git] / src / flash / cfi.c

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 66a1c6565ade4e3991e7f3ae96319ac0ea0d247c..82120d8d2e16d7896e0d9b00031c04df27c38505 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -1375,11 +1375,11 @@ int cfi_spansion_write_block(struct flash_bank_s *bank, u8 *buffer, u32 address,
                }\r
 \r
                /* allocate working area */\r
-               if (target_alloc_working_area(target, 24 * 4,\r
-                       &cfi_info->write_algorithm) != ERROR_OK)\r
+               retval=target_alloc_working_area(target, 24 * 4,\r
+                               &cfi_info->write_algorithm);\r
+               if (retval != ERROR_OK)\r
                {\r
-                       WARNING("no working area available, can't do block memory writes");\r
-                       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;\r
+                       return retval;\r
                }\r
 \r
                /* write algorithm code to working area */\r
@@ -1645,11 +1645,6 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        int i;\r
        int retval;\r
 \r
-       if (bank->target->state != TARGET_HALTED)\r
-       {\r
-               return ERROR_TARGET_NOT_HALTED;\r
-       }\r
-\r
        if (offset + count > bank->size)\r
                return ERROR_FLASH_DST_OUT_OF_BANK;\r
 \r