Title: [8929] trunk: [#5975] make sure id must exist for standard JEDEC flash
- Revision
- 8929
- Author
- bhsong
- Date
- 2010-06-20 23:21:30 -0400 (Sun, 20 Jun 2010)
Log Message
[#5975] make sure id must exist for standard JEDEC flash
Mike prefer to use non_jedec instead of jedec
Modified Paths
Diff
Modified: trunk/drivers/mtd/devices/m25p80.c (8928 => 8929)
--- trunk/drivers/mtd/devices/m25p80.c 2010-06-18 10:08:48 UTC (rev 8928)
+++ trunk/drivers/mtd/devices/m25p80.c 2010-06-21 03:21:30 UTC (rev 8929)
@@ -795,7 +795,7 @@
jid = jedec_probe(spi);
if (!jid) {
- if (data->jedec) {
+ if (!data->non_jedec) {
dev_err(&spi->dev, "fail to detect%s\n",
id->name);
return -ENODEV;
Modified: trunk/include/linux/spi/flash.h (8928 => 8929)
--- trunk/include/linux/spi/flash.h 2010-06-18 10:08:48 UTC (rev 8928)
+++ trunk/include/linux/spi/flash.h 2010-06-21 03:21:30 UTC (rev 8929)
@@ -26,11 +26,10 @@
char *type;
/*
- * 1: standard JEDEC, id need be matched while detecting
- * 0: non-JEDEC, id will be 0. in this case, we can't find
- * make sure whether the flash exists or not by detecting
+ * For non-JEDEC, id will be 0. In this case, we can't be sure
+ * whether the flash exists with runtime probing.
*/
- int jedec;
+ int non_jedec;
/* we'll likely add more ... use JEDEC IDs, etc */
};
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
