diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-09-29 00:16:44 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:32:03 -0700 |
| commit | 47b1c0f588e859aab11281e318e1334e4f472e85 (patch) | |
| tree | c1f5f847e95d804bdc9f45a3ae9f95d30e687e16 /drivers/mtd | |
| parent | e5ed043c6ae50fa01e78aa7ad5a6e064bf8f3273 (diff) | |
3.0: update mtd api
Rebase-Id: R3cff5fe5cf5f95670f9481dcbf66d230e3cde6b1
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/devices/tegra_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/tegra_nand.c b/drivers/mtd/devices/tegra_nand.c index b2ce78216be4..4b01d740ad5b 100644 --- a/drivers/mtd/devices/tegra_nand.c +++ b/drivers/mtd/devices/tegra_nand.c @@ -1647,12 +1647,12 @@ static int tegra_nand_probe(struct platform_device *pdev) #ifdef CONFIG_MTD_PARTITIONS err = parse_mtd_partitions(mtd, part_probes, &info->parts, 0); if (err > 0) { - err = add_mtd_partitions(mtd, info->parts, err); + err = mtd_device_register(mtd, info->parts, err); } else if (err <= 0 && plat->parts) { - err = add_mtd_partitions(mtd, plat->parts, plat->nr_parts); + err = mtd_device_register(mtd, plat->parts, plat->nr_parts); } else #endif - err = add_mtd_device(mtd); + err = mtd_device_register(mtd, NULL, 0); if (err != 0) goto out_free_bbbmap; |