#include <linux/err.h>
#include <linux/of.h>
-@@ -834,6 +835,37 @@ void deregister_mtd_parser(struct mtd_pa
+@@ -844,6 +845,37 @@ 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!
-@@ -983,6 +1015,13 @@ int parse_mtd_partitions(struct mtd_info
+@@ -993,6 +1025,13 @@ int parse_mtd_partitions(struct mtd_info
struct mtd_partitions pparts = { };
struct mtd_part_parser *parser;
int ret, err = 0;
if (!types)
types = mtd_is_partition(master) ? default_subpartition_types :
-@@ -1024,6 +1063,7 @@ int parse_mtd_partitions(struct mtd_info
+@@ -1034,6 +1073,7 @@ int parse_mtd_partitions(struct mtd_info
if (ret < 0 && !err)
err = ret;
}