projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mtd
/
nand
/
mxc_nand.c
diff --git
a/drivers/mtd/nand/mxc_nand.c
b/drivers/mtd/nand/mxc_nand.c
index 3657a6eb026fc80c6e5175e237e76dd857d9a396..fcf8ceb277d44cd3e78b5c5e0249ec1b40d7ab33 100644
(file)
--- a/
drivers/mtd/nand/mxc_nand.c
+++ b/
drivers/mtd/nand/mxc_nand.c
@@
-1120,6
+1120,8
@@
static int __init mxcnd_probe(struct platform_device *pdev)
parse_mtd_partitions(mtd, part_probes, &host->parts, 0);
if (nr_parts > 0)
add_mtd_partitions(mtd, host->parts, nr_parts);
+ else if (pdata->parts)
+ add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);
else
#endif
{