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

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index d0240f55d4996fe8148b9950dd2eb47ca85b845d..3267c5de36d1b12a190f93f9a3048ded598f84aa 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -544,6 +544,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
 #endif
 
        /* Wait for command completion */
+       reset_timer();
        start = get_timer (0);
        while (flash_is_busy (info, sector)) {
                if (get_timer (start) > tout) {
@@ -630,6 +631,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
 #endif
 
        /* Wait for command completion */
+       reset_timer();
        start = get_timer(0);
        while (1) {
                switch (info->portwidth) {