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

4284f36a · Wolfgang Denk · c550afad · c40c94a3 · 4284f36a
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

drivers/mtd/cfi_flash.c drivers/mtd/cfi_flash.c +4 -1

未找到文件。
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -537,7 +537,10 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
 	ulong start;

 #if CONFIG_SYS_HZ != 1000
-	tout *= CONFIG_SYS_HZ/1000;
+	if ((ulong)CONFIG_SYS_HZ > 100000)
+		tout *= (ulong)CONFIG_SYS_HZ / 1000;  /* for a big HZ, avoid overflow */
+	else
+		tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000);
 #endif

 	/* Wait for command completion */