mtd/drivers/mtd/chips cfi_cmdset_0002.c,1.85,1.86

[Thayne Harbaugh]

Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv5969

Modified Files:
	cfi_cmdset_0002.c 
Log Message:
better "Unsupported buswidth" output (somehow I missed these last time I fixed this)

Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- cfi_cmdset_0002.c	17 Oct 2003 19:30:23 -0000	1.85
+++ cfi_cmdset_0002.c	17 Oct 2003 20:32:40 -0000	1.86
@@ -649,6 +649,11 @@
 #ifdef CONFIG_MTD_CFI_AMDSTD_RETRY
  retry_cmd:
 #endif
+	status = cfi_read(map, adr);
+        
+	DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): READ 0x%.8lx(0x%.8x)\n",
+	       __func__, adr, status );
+
 	DEBUG( MTD_DEBUG_LEVEL3, "MTD %s(): WRITE 0x%.8lx(0x%.8x)\n",
 	       __func__, adr, datum );
 
@@ -764,9 +769,9 @@
 		if ( status & dq5mask ) {
 			/* dq5 asserted - decode interleave chips */
 			printk( KERN_WARNING
-				"MTD %s(): FLASH internal timeout: 0x%.8x\n",
+				"MTD %s(): FLASH internal timeout: 0x%.8x 0x%.8x 0x%8x\n",
 				__func__,
-				status & dq5mask );
+				status & dq5mask, status, datum );
 		} else {
 			printk( KERN_WARNING
 				"MTD %s(): Software timed out during write.\n",
@@ -1122,7 +1127,8 @@
 		datum = (__u64)~0;
 #endif
 	} else {
-		printk(KERN_WARNING "Unsupported buswidth\n");
+		printk(KERN_WARNING "MTD %s(): Unsupported buswidth %d\n",
+		       __func__, CFIDEV_BUSWIDTH);
 		goto op_failed;
 	}
 
@@ -1219,7 +1225,6 @@
 	cfi_send_gen_cmd(0x80, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
 	cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
 	cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
-
 	cfi_write(map, CMD(0x30), adr);
 	
 	timeo = jiffies + (HZ*20);
@@ -1310,7 +1315,8 @@
 		datum = (__u64)~0;
 #endif
 	} else {
-		printk(KERN_WARNING "Unsupported buswidth\n");
+		printk(KERN_WARNING "MTD %s(): Unsupported buswidth %d\n",
+		       __func__, CFIDEV_BUSWIDTH);
 		goto op_failed;
 	}