mirror of
https://github.com/torvalds/linux
synced 2024-09-22 20:37:18 +00:00
[MTD] [NAND] at91_nand: Make mtdparts option can override board info
Call parse_mtd_partitions before checking board's partition_info, so that "mtdparts=" option can override board's default setting. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
parent
79dcd8e9e1
commit
842b1a105c
|
@ -156,14 +156,14 @@ static int __init at91_nand_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_MTD_PARTITIONS
|
#ifdef CONFIG_MTD_PARTITIONS
|
||||||
if (host->board->partition_info)
|
|
||||||
partitions = host->board->partition_info(mtd->size, &num_partitions);
|
|
||||||
#ifdef CONFIG_MTD_CMDLINE_PARTS
|
#ifdef CONFIG_MTD_CMDLINE_PARTS
|
||||||
else {
|
mtd->name = "at91_nand";
|
||||||
mtd->name = "at91_nand";
|
num_partitions = parse_mtd_partitions(mtd, part_probes,
|
||||||
num_partitions = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
|
&partitions, 0);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
if (num_partitions <= 0 && host->board->partition_info)
|
||||||
|
partitions = host->board->partition_info(mtd->size,
|
||||||
|
&num_partitions);
|
||||||
|
|
||||||
if ((!partitions) || (num_partitions == 0)) {
|
if ((!partitions) || (num_partitions == 0)) {
|
||||||
printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
|
printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
|
||||||
|
|
Loading…
Reference in a new issue