--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -251,7 +251,8 @@ static int m25p_probe(struct spi_device
+@@ -248,8 +248,10 @@ static int m25p_probe(struct spi_device
+ if (ret)
+ return ret;
- ppdata.of_node = spi->dev.of_node;
-
-- return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
+- return mtd_device_register(&nor->mtd, data ? data->parts : NULL,
+- data ? data->nr_parts : 0);
+ return mtd_device_parse_register(&nor->mtd,
-+ data ? data->part_probe_types : NULL, &ppdata,
- data ? data->parts : NULL,
- data ? data->nr_parts : 0);
++ data ? data->part_probe_types : NULL, NULL,
++ data ? data->parts : NULL,
++ data ? data->nr_parts : 0);
}
+
+