1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index ae5fe91867e1..10ed195c0c1c 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -736,7 +736,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
                         flash->partitioned = 1;
                         return add_mtd_partitions(&flash->mtd, parts, nr_parts);
                 }
-        } else if (data->nr_parts)
+        } else if (data && data->nr_parts)
                 dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
                                 data->nr_parts, data->name);