diff options
| author | Brian Norris | 2015-12-09 09:59:45 -0800 |
|---|---|---|
| committer | Brian Norris | 2015-12-09 10:00:34 -0800 |
| commit | 2027cba66a0591e65a64d3ecfe8a3aa2f55a681b (patch) | |
| tree | cef84a83fe8b32344331020bcf01b42f28a106c5 /drivers/mtd/ofpart.c | |
| parent | 5ba8c27a6e5e7b6d63f3038fd92c066a3332f455 (diff) | |
| parent | e488ca9f8d4f62c2dc36bfa5c32f68e7f05ab381 (diff) | |
mtd: merge for-4.4 development into -next development
A few MAINTAINERS updates, and some DT binding/documentation fixups.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/ofpart.c')
| -rw-r--r-- | drivers/mtd/ofpart.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index 478538100ddd..904645143397 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c @@ -44,10 +44,18 @@ static int parse_ofpart_partitions(struct mtd_info *master, ofpart_node = of_get_child_by_name(mtd_node, "partitions"); if (!ofpart_node) { - pr_warn("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n", - master->name, mtd_node->full_name); + /* + * We might get here even when ofpart isn't used at all (e.g., + * when using another parser), so don't be louder than + * KERN_DEBUG + */ + pr_debug("%s: 'partitions' subnode not found on %s. Trying to parse direct subnodes as partitions.\n", + master->name, mtd_node->full_name); ofpart_node = mtd_node; dedicated = false; + } else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) { + /* The 'partitions' subnode might be used by another parser */ + return 0; } /* First count the subnodes */ |