summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-01-02 14:06:26 +0100
committerWolfgang Denk <wd@denx.de>2008-01-02 16:07:01 +0100
commitce37422d0002e10490e268392e0c4e3028e52cec (patch)
treeda1247eb0171885c2596e471affbc6b19e4489ff /drivers
parent1182e9f8e3b92fc372d64943293de53daa2e26cf (diff)
downloadtalos-obmc-uboot-ce37422d0002e10490e268392e0c4e3028e52cec.tar.gz
talos-obmc-uboot-ce37422d0002e10490e268392e0c4e3028e52cec.zip
cfi_flash: Fix bug in flash_isset() to use correct 32bit function
This bug was detected on the LWMON5 target which has 2 Intel 16bit wide flash chips connected to a 32bit wide port. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/cfi_flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index d1124d3439..4f61e365e8 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -527,7 +527,7 @@ static int flash_isset (flash_info_t * info, flash_sect_t sect,
retval = ((flash_read16(addr) & cword.w) == cword.w);
break;
case FLASH_CFI_32BIT:
- retval = ((flash_read16(addr) & cword.l) == cword.l);
+ retval = ((flash_read32(addr) & cword.l) == cword.l);
break;
case FLASH_CFI_64BIT:
retval = ((flash_read64(addr) & cword.ll) == cword.ll);
OpenPOWER on IntegriCloud