public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors
@ 2014-09-04  9:23 Baruch Siach
  2014-10-06  6:19 ` Baruch Siach
  2014-10-06 16:28 ` Edward L Swarthout
  0 siblings, 2 replies; 6+ messages in thread
From: Baruch Siach @ 2014-09-04  9:23 UTC (permalink / raw)
  To: u-boot

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 <Ed.Swarthout@freescale.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 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,
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-10-06 16:28 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-04  9:23 [U-Boot] [PATCH] cfi_flash: don't hide write/erase errors Baruch Siach
2014-10-06  6:19 ` Baruch Siach
2014-10-06  8:20   ` Stefan Roese
2014-10-06 11:32     ` Baruch Siach
2014-10-06 12:09       ` Stefan Roese
2014-10-06 16:28 ` Edward L Swarthout

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox