Merge branch 'master' of git://git.denx.de/u-boot-samsung

[oweals/u-boot.git] / board / purple / flash.c

diff --git a/board/purple/flash.c b/board/purple/flash.c
index 37c7becbaa2a8807d6827358358277118126831e..5cee35ec2d92cf3dc1f5e059eefa430b83e6c4df 100644 (file)
--- a/board/purple/flash.c
+++ b/board/purple/flash.c
@@ -448,7 +448,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
        FPWV *addr;
        int flag, prot, sect;
        ulong start, now, last;
-       int rcode = 0;
        FUNCPTR_WR absEntry;
 
        load_cmd(IN_RAM_CMD_WRITE);
@@ -490,7 +489,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
        last  = get_timer(0);
 
        /* Start erase on unprotected sectors */
-       for (sect = s_first; sect<=s_last && rcode == 0; sect++) {
+       for (sect = s_first; sect<=s_last; sect++) {
 
                if (info->protect[sect] != 0)   /* protected, skip it */
                        continue;
@@ -523,7 +522,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
        }
 
        printf (" done\n");
-       return rcode;
+       return 0;
 }
 
 /*-----------------------------------------------------------------------