Index: drivers/cfi_flash.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/drivers/cfi_flash.c,v
retrieving revision 1.17
diff -p -u -r1.17 cfi_flash.c
--- drivers/cfi_flash.c	13 Apr 2005 10:02:47 -0000	1.17
+++ drivers/cfi_flash.c	6 May 2005 07:06:04 -0000
@@ -676,7 +676,7 @@ static int flash_status_check (flash_inf
 	/* Wait for command completion */
 	start = get_timer (0);
 	while (flash_is_busy (info, sector)) {
-		if (get_timer (start) > info->erase_blk_tout * CFG_HZ) {
+		if (get_timer (start) > tout * CFG_HZ) {
 			printf ("Flash %s timeout at address %lx data %lx\n",
 				prompt, info->start[sector],
 				flash_read_long (info, sector, 0));
@@ -701,7 +701,7 @@ static int flash_full_status_check (flas
 	case CFI_CMDSET_INTEL_EXTENDED:
 	case CFI_CMDSET_INTEL_STANDARD:
 		if ((retcode != ERR_OK)
-		    && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
+		    || !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
 			retcode = ERR_INVAL;
 			printf ("Flash %s error at address %lx\n", prompt,
 				info->start[sector]);
@@ -1263,7 +1263,6 @@ static int flash_write_cfibuffer (flash_
 						 info->buffer_write_tout,
 						 "buffer write");
 	}
-	flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
 	return retcode;
 }
 #endif /* CFG_FLASH_USE_BUFFER_WRITE */