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

d1e990ce · Wolfgang Denk · 41e7bbe0 · 9abda6ba · d1e990ce
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

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

未找到文件。
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -596,7 +596,8 @@ static int flash_toggle (flash_info_t * info, flash_sect_t sect,
 		retval = flash_read32(addr) != flash_read32(addr);
 		break;
 	case FLASH_CFI_64BIT:
-		retval = flash_read64(addr) != flash_read64(addr);
+		retval = ( (flash_read32( addr ) != flash_read32( addr )) ||
+			   (flash_read32(addr+4) != flash_read32(addr+4)) );
 		break;
 	default:
 		retval = 0;