Fix regression in drivers/mtd/cfi_flash.c.

Fix a regression in the 1.3.4 version of drivers/mtd/cfi_flash.c.

Add a case to the new switch statement in flash_real_protect() to make flash chips using the Intel extended command set work again. Also correct a debug printf format-string/argument mismatch.

---
 drivers/mtd/cfi_flash.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

index 58295fe..043ff4d 100644
@@ -516,7 +516,7 @@ static int flash_isequal (flash_info_t * info, flash_sect_t sect,
 		retval = (flash_read16(addr) == cword.w);
 		break;
 	case FLASH_CFI_32BIT:
-		debug ("is= %8.8lx %8.8lx\n", flash_read32(addr), cword.l);
+		debug ("is= %8.8x %8.8lx\n", flash_read32(addr), cword.l);
 		retval = (flash_read32(addr) == cword.l);
 		break;
 	case FLASH_CFI_64BIT:

@@ -1357,6 +1357,7 @@ int flash_real_protect (flash_info_t * info, long sector, int prot)
 	switch (info->vendor) {
 		case CFI_CMDSET_INTEL_PROG_REGIONS:
 		case CFI_CMDSET_INTEL_STANDARD:
+		case CFI_CMDSET_INTEL_EXTENDED:
 			flash_write_cmd (info, sector, 0,
 					 FLASH_CMD_CLEAR_STATUS);
 			flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT);

1.5.5

The Intel extended command set problem was fixed with another patch just yesterday:

[PATCH] Add CFI_CMDSET_INTEL_EXTENDED to fix flash_real_protect()

From Nick Spence.

It would be great though if you could send another patch to fix the debug printf problem.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================