X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=drivers%2Fmtd%2Fdevices%2Fm25p80.c;h=669d2b7e36bb758fd5b41ceab37bf29c95ad7fca;hb=67577927e8d7a1f4b09b4992df640eadc6aacb36;hp=7e0edd40ad4149f7c6653ffdc17fa102eef0102c;hpb=6fe4c590313133ebd5dadb769031489ff178ece1;p=net-next-2.6.git

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7e0edd40ad4..669d2b7e36b 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -928,6 +928,13 @@ static int __devinit m25p_probe(struct spi_device *spi)
 			nr_parts = data->nr_parts;
 		}
 
+#ifdef CONFIG_OF
+		if (nr_parts <= 0 && spi->dev.of_node) {
+			nr_parts = of_mtd_parse_partitions(&spi->dev,
+					spi->dev.of_node, &parts);
+		}
+#endif
+
 		if (nr_parts > 0) {
 			for (i = 0; i < nr_parts; i++) {
 				DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = "