mtd/drivers/mtd/chips cfi_cmdset_0001.c,1.105,1.106

[David Woodhouse]

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

Modified Files:
	cfi_cmdset_0001.c 
Log Message:
Don't oops on deciding whether we can suspend erase on chips which were
probed by jedec_probe and hence have no cmdset_priv.


Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- cfi_cmdset_0001.c	21 Oct 2002 13:40:06 -0000	1.105
+++ cfi_cmdset_0001.c	6 Nov 2002 16:13:57 -0000	1.106
@@ -470,7 +470,8 @@
 	 */
 	switch (chip->state) {
 	case FL_ERASING:
-		if (!(((struct cfi_pri_intelext *)cfi->cmdset_priv)->FeatureSupport & 2))
+		if (!cfi->cmdset_priv ||
+		    !(((struct cfi_pri_intelext *)cfi->cmdset_priv)->FeatureSupport & 2))
 			goto sleep; /* We don't support erase suspend */
 		
 		cfi_write (map, CMD(0xb0), cmd_addr);