diff options
Diffstat (limited to 'drivers/mtd/nand/davinci_nand.c')
| -rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 945047ad0952..3502606f6480 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c | |||
| @@ -821,9 +821,16 @@ syndrome_done: | |||
| 821 | if (ret < 0) | 821 | if (ret < 0) |
| 822 | goto err_scan; | 822 | goto err_scan; |
| 823 | 823 | ||
| 824 | ret = mtd_device_parse_register(&info->mtd, NULL, NULL, pdata->parts, | 824 | if (pdata->parts) |
| 825 | pdata->nr_parts); | 825 | ret = mtd_device_parse_register(&info->mtd, NULL, NULL, |
| 826 | 826 | pdata->parts, pdata->nr_parts); | |
| 827 | else { | ||
| 828 | struct mtd_part_parser_data ppdata; | ||
| 829 | |||
| 830 | ppdata.of_node = pdev->dev.of_node; | ||
| 831 | ret = mtd_device_parse_register(&info->mtd, NULL, &ppdata, | ||
| 832 | NULL, 0); | ||
| 833 | } | ||
| 827 | if (ret < 0) | 834 | if (ret < 0) |
| 828 | goto err_scan; | 835 | goto err_scan; |
| 829 | 836 | ||