Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / drivers / mtd / nand / omap2.c

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 1a88bd062ac1ab44e0a50053928a5ef3ddd794e2..8e820ddf4e085ba0091c7238085395b40c4b0c39 100644 (file)
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1828,6 +1828,7 @@ static int omap_nand_probe(struct platform_device *pdev)
        dma_cap_mask_t mask;
        unsigned sig;
        struct resource                 *res;
+       struct mtd_part_parser_data     ppdata = {};
 
        pdata = pdev->dev.platform_data;
        if (pdata == NULL) {
@@ -2056,7 +2057,8 @@ static int omap_nand_probe(struct platform_device *pdev)
                goto out_release_mem_region;
        }
 
-       mtd_device_parse_register(&info->mtd, NULL, NULL, pdata->parts,
+       ppdata.of_node = pdata->of_node;
+       mtd_device_parse_register(&info->mtd, NULL, &ppdata, pdata->parts,
                                  pdata->nr_parts);
 
        platform_set_drvdata(pdev, &info->mtd);