- change error message for image_open error

- changed run_size to size_read in argument of image_read_section
(thanks to oyvind Harboe for this patch)

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

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 6c1fbd91539a29b639f3f580e260ad8b84d4dd1e..2271f603cc74bf92eaf81d6ffca8886822898e79 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -563,11 +563,12 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
        }
        
        image.start_address_set = 0;
-
-       if (image_open(&image, args[0], (argc == 4) ? args[2] : NULL) != ERROR_OK)
+\r
+       retval = image_open(&image, args[0], (argc == 4) ? args[2] : NULL);
+       if (retval != ERROR_OK)
        {
-               command_print(cmd_ctx, "flash write error: %s", image.error_str);
-               return ERROR_OK;
+               command_print(cmd_ctx, "image_open error: %s", image.error_str);
+               return retval;
        }
        
        failed = malloc(sizeof(int) * image.num_sections);
@@ -849,7 +850,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str
                                size_read = image->sections[section].size - section_offset;
                        
                        if ((retval = image_read_section(image, section, section_offset,
-                                       run_size, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
+                                       size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
                        {
                                free(buffer);