From: Baruch Siach Date: Mon, 6 Oct 2014 09:19:01 +0300 Subject: [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors In-Reply-To: References: Message-ID: <20141006061901.GD2567@sapphire.tkos.co.il> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Stefan, On Thu, Sep 04, 2014 at 12:23:09PM +0300, Baruch Siach wrote: > Partially revert commit 0d01f66d235118 (CFI: cfi_flash write fix for AMD > legacy). > > flash_full_status_check() used to skip status register parsing when > flash_status_check() returns OK. This is wrong since flash_status_check() > must return OK for other status bits to be valid. > > Cc: Ed Swarthout > Signed-off-by: Baruch Siach > --- > drivers/mtd/cfi_flash.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c > index c4b5bc1de553..9b3175d87fbd 100644 > --- a/drivers/mtd/cfi_flash.c > +++ b/drivers/mtd/cfi_flash.c > @@ -593,7 +593,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector, > case CFI_CMDSET_INTEL_PROG_REGIONS: > case CFI_CMDSET_INTEL_EXTENDED: > case CFI_CMDSET_INTEL_STANDARD: > - if ((retcode != ERR_OK) > + if ((retcode == ERR_OK) > && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) { > retcode = ERR_INVAL; > printf ("Flash %s error at address %lx\n", prompt, Ping? baruch -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -