#include <linux/err.h>
#include <linux/of.h>
-@@ -851,6 +852,32 @@ void deregister_mtd_parser(struct mtd_pa
+@@ -835,6 +836,32 @@ void deregister_mtd_parser(struct mtd_pa
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
/*
* Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you
* are changing this array!
*/
-@@ -991,6 +1018,13 @@ int parse_mtd_partitions(struct mtd_info
+@@ -983,6 +1010,13 @@ int parse_mtd_partitions(struct mtd_info
struct mtd_partitions pparts = { };
struct mtd_part_parser *parser;
int ret, err = 0;
+ }
if (!types)
- types = default_mtd_part_types;
-@@ -1031,6 +1065,7 @@ int parse_mtd_partitions(struct mtd_info
+ types = mtd_is_partition(master) ? default_subpartition_types :
+@@ -1024,6 +1058,7 @@ int parse_mtd_partitions(struct mtd_info
if (ret < 0 && !err)
err = ret;
}