Skip to content
Snippets Groups Projects
Commit a2336310 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

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

parents 797131c1 22d6c8fa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
drivers/mtd/cfi_flash.c
+ 2
− 0
View file @ a2336310
...@@ -544,6 +544,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, ...@@ -544,6 +544,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
#endif #endif
/* Wait for command completion */ /* Wait for command completion */
reset_timer();
start = get_timer (0); start = get_timer (0);
while (flash_is_busy (info, sector)) { while (flash_is_busy (info, sector)) {
if (get_timer (start) > tout) { if (get_timer (start) > tout) {
...@@ -630,6 +631,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, ...@@ -630,6 +631,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
#endif #endif
/* Wait for command completion */ /* Wait for command completion */
reset_timer();
start = get_timer(0); start = get_timer(0);
while (1) { while (1) {
switch (info->portwidth) { switch (info->portwidth) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment