kernel: backport mtd patch for minor partitioning cleanup

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

diff --git a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
index 5f0fa3a418fccafe3eefb0f102bd8353e210af68..e2a0e4887d40fa9cd59355004ca87909796173ff 100644 (file)
--- a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
+++ b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
@@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <linux/err.h>
  #include <linux/of.h>
  
-@@ -856,6 +857,42 @@ void deregister_mtd_parser(struct mtd_pa
+@@ -843,6 +844,42 @@ void deregister_mtd_parser(struct mtd_pa
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
  
  /*
@@ -157,8 +157,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!
   */
-@@ -999,6 +1036,13 @@ int parse_mtd_partitions(struct mtd_info
- {
+@@ -983,6 +1020,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;
@@ -171,7 +171,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
        if (!types)
                types = default_mtd_part_types;
-@@ -1035,6 +1079,7 @@ int parse_mtd_partitions(struct mtd_info
+@@ -1023,6 +1067,7 @@ int parse_mtd_partitions(struct mtd_info
                if (ret < 0 && !err)
                        err = ret;
        }