[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-207-g909130e

[Spencer O. <nt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  909130e16ee70157d3de6cd5c15fdea0f8fe6a6f (commit)
      from  282e89c878fd43ba90f0a9416adce81c5f596af7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 909130e16ee70157d3de6cd5c15fdea0f8fe6a6f
Author: Spencer Oliver <nt...@us...>
Date:   Tue May 4 15:51:43 2010 +0100

    str71x: fix previous commit
    
    fix build issue with 70226c221f5879bb6126ff3f2ec9ae64c68d80d6 commit
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 556dec2..adabad7 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
 		{

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/str7x.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository