kernel: backport mtd patch for minor partitioning cleanup

[openwrt/staging/mkresin.git] / target / linux / generic / pending-4.14 / 161-mtd-part-add-generic-parsing-of-linux-part-probe.patch

diff --git a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
index 6379ff33fd5291f4bb0a9659cec10a3b899eb538..0e858d93bba85a49826268aa6207a018d0502948 100644 (file)
--- a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
+++ b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <linux/err.h>
  #include <linux/of.h>
  
-@@ -864,6 +865,32 @@ void deregister_mtd_parser(struct mtd_pa
+@@ -851,6 +852,32 @@ void deregister_mtd_parser(struct mtd_pa
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
  
  /*
@@ -137,8 +137,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
   * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you
   * are changing this array!
   */
-@@ -1007,6 +1034,13 @@ int parse_mtd_partitions(struct mtd_info
- {
+@@ -991,6 +1018,13 @@ int parse_mtd_partitions(struct mtd_info
+       struct mtd_partitions pparts = { };
        struct mtd_part_parser *parser;
        int ret, err = 0;
 +      const char *const *types_of = NULL;
@@ -151,7 +151,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
        if (!types)
                types = default_mtd_part_types;
-@@ -1043,6 +1077,7 @@ int parse_mtd_partitions(struct mtd_info
+@@ -1031,6 +1065,7 @@ int parse_mtd_partitions(struct mtd_info
                if (ret < 0 && !err)
                        err = ret;
        }