diff -Naur linux-2.6.30.4-orig/drivers/mtd/devices/m25p80.c linux-2.6.30.4-new/drivers/mtd/devices/m25p80.c
--- linux-2.6.30.4-orig/drivers/mtd/devices/m25p80.c	2010-08-04 12:46:35.042583000 -0700
+++ linux-2.6.30.4-new/drivers/mtd/devices/m25p80.c	2010-08-04 18:34:45.416083000 -0700
@@ -570,6 +570,13 @@
 	jedec = jedec << 8;
 	jedec |= id[2];
 
+	/* Only take JEDEC ID from the w25q80 Winbond part */ 
+	if ( jedec != 0xef4014 )
+	{
+		dev_err(&spi->dev, "Wrong JEDEC id %06x\n", jedec);
+		return NULL;
+	}
+
 	ext_jedec = id[3] << 8 | id[4];
 
 	for (tmp = 0, info = m25p_data;
