diff options
| -rw-r--r-- | src/flash/flash.c | 2 | ||||
| -rw-r--r-- | src/target/image.c | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c index b9e5a9dc..3478b6a2 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -478,7 +478,7 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char * p = get_flash_bank_by_addr(target, address); if (p == NULL) { - return ERROR_COMMAND_SYNTAX_ERROR; + return ERROR_FAIL; } /* We can't know if we did a resume + halt, in which case we no longer know the erased state */ diff --git a/src/target/image.c b/src/target/image.c index 1eb95672..72a3828c 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -57,15 +57,19 @@ static int autodetect_image_type(image_t *image, char *url) { return retval; } - if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK) - { - return ERROR_FILEIO_OPERATION_FAILED; - } - if (read_bytes != 9) + retval = fileio_read(&fileio, 9, buffer, &read_bytes); + + if (retval==ERROR_OK) { - return ERROR_FILEIO_OPERATION_FAILED; + if (read_bytes != 9) + { + retval=ERROR_FILEIO_OPERATION_FAILED; + } } fileio_close(&fileio); + + if (retval!=ERROR_OK) + return retval; /* check header against known signatures */ if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0) |