mtd/drivers/mtd/chips cfi_cmdset_0002.c,1.54,1.55

[David Woodhouse]

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

Modified Files:
	cfi_cmdset_0002.c 
Log Message:
Disable fast programming mode because it's broken

Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cfi_cmdset_0002.c	10 Jan 2002 20:27:40 -0000	1.54
+++ cfi_cmdset_0002.c	18 May 2002 07:42:03 -0000	1.55
@@ -237,6 +237,15 @@
 		return NULL;
 		break;
 	}
+	if (cfi->fast_prog) {
+		/* In cfi_amdstd_write() we frob the protection stuff
+		   without paying any attention to the state machine.
+		   This upsets in-progress erases. So we turn this flag
+		   off for now till the code gets fixed. */
+		printk(KERN_NOTICE "cfi_cmdset_0002: Disabling fast programming due to code brokenness.\n");
+		cfi->fast_prog = 0;
+	}
+		
 	mtd->sync = cfi_amdstd_sync;
 	mtd->suspend = cfi_amdstd_suspend;
 	mtd->resume = cfi_amdstd_resume;