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

[u-boot] / drivers / mtd / cfi_flash.c

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c40bf661052082b2d1424d8f70e0f44ad86602bc..24e9b9fa2e52c0affd3bd12b0fd09e0a7032da23 100644 (file)
--- 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;