From: Spencer Oliver <ntfreak@users.sourceforge.net>
Date: Tue, 4 May 2010 14:51:43 +0000 (+0100)
Subject: str71x: fix previous commit
X-Git-Tag: v0.5.0-rc1~725
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=909130e16ee70157d3de6cd5c15fdea0f8fe6a6f;p=openocd

str71x: fix previous commit

fix build issue with 70226c221f5879bb6126ff3f2ec9ae64c68d80d6 commit

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
---

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
 		{