summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpencer Oliver <ntfreak@users.sourceforge.net>2010-05-04 15:51:43 +0100
committerSpencer Oliver <ntfreak@users.sourceforge.net>2010-05-04 15:51:43 +0100
commit909130e16ee70157d3de6cd5c15fdea0f8fe6a6f (patch)
treef5bcd3ac22dec3ff77bf7727cd7b32278c2b25ed /src
parent282e89c878fd43ba90f0a9416adce81c5f596af7 (diff)
downloadopenocd_libswd-909130e16ee70157d3de6cd5c15fdea0f8fe6a6f.tar.gz
openocd_libswd-909130e16ee70157d3de6cd5c15fdea0f8fe6a6f.tar.bz2
openocd_libswd-909130e16ee70157d3de6cd5c15fdea0f8fe6a6f.tar.xz
openocd_libswd-909130e16ee70157d3de6cd5c15fdea0f8fe6a6f.zip
str71x: fix previous commit
fix build issue with 70226c221f5879bb6126ff3f2ec9ae64c68d80d6 commit Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r--src/flash/nor/str7x.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 556dec26..adabad7d 100644
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -498,9 +498,6 @@ static int str7x_write(struct flash_bank *bank, uint8_t *buffer,
/* if block write failed (no sufficient working area),
* we use normal (slow) single dword accesses */
LOG_WARNING("couldn't use block writes, falling back to single memory accesses");
- } else
- {
- return retval;
}
else if (retval == ERROR_FLASH_OPERATION_FAILED)
{
@@ -510,6 +507,10 @@ static int str7x_write(struct flash_bank *bank, uint8_t *buffer,
LOG_ERROR("flash writing failed with error code: 0x%x", retval);
return ERROR_FLASH_OPERATION_FAILED;
}
+ else
+ {
+ return retval;
+ }
}
else
{