1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 6f512b5c117b..ea22520c0406 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -924,6 +924,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] = "