mtd/drivers/mtd/chips cfi_cmdset_0001.c,1.145,1.146

[Nicolas Pitre]

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

Modified Files:
	cfi_cmdset_0001.c 
Log Message:
contender should never be shared->erasing since the erase might be suspended
and another thread could come along and try to start another erase for the
same partition.  shared->writing is always the definite contender.


Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- cfi_cmdset_0001.c	10 Jun 2004 20:54:55 -0000	1.145
+++ cfi_cmdset_0001.c	11 Jun 2004 16:30:36 -0000	1.146
@@ -443,8 +443,6 @@
 		struct flchip *contender;
 		spin_lock(&shared->lock);
 		contender = shared->writing;
-		if (mode == FL_ERASING && shared->erasing)
-			contender = shared->erasing;
 		if (contender && contender != chip) {
 			/*
 			 * The engine to perform desired operation on this