summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-04-08 00:26:03 +0200
committerWolfgang Denk <wd@denx.de>2010-04-08 00:26:03 +0200
commita233631095eba3e853049f6656642e3a7ef1d73c (patch)
tree8a10b3f15dc1193e5016a36faeffc479119c83e7 /drivers
parent797131c12595b3d0e2964b706006938c822ee874 (diff)
parent22d6c8faac4e9fa43232b0cf4da427ec14d72ad3 (diff)
downloadu-boot-imx-a233631095eba3e853049f6656642e3a7ef1d73c.zip
u-boot-imx-a233631095eba3e853049f6656642e3a7ef1d73c.tar.gz
u-boot-imx-a233631095eba3e853049f6656642e3a7ef1d73c.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/cfi_flash.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index d0240f5..3267c5d 100644
--- 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) {