kernel: bump 4.14 to 4.14.89

[oweals/openwrt.git] / target / linux / generic / pending-4.14 / 401-mtd-add-support-for-different-partition-parser-types.patch

diff --git a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
index 2b8a17b435ec4095f95270eae3b8da06667eaaeb..359c4c167bbe9c1a7f3878468e1b195b98eff9aa 100644 (file)
--- a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
+++ b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -20,18 +20,18 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  
  /*
   * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
-@@ -751,6 +755,28 @@ int mtd_del_partition(struct mtd_info *m
+@@ -751,6 +755,36 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
-+static int run_parsers_by_type(struct mtd_part *slave,
-+                             enum mtd_parser_type type)
++static int
++run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
 +{
-+      const struct mtd_partition *parts;
++      struct mtd_partition *parts;
 +      int nr_parts;
-+      int err;
++      int i;
 +
-+      nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, &parts,
++      nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, (const struct mtd_partition **)&parts,
 +                                              NULL);
 +      if (nr_parts <= 0)
 +              return nr_parts;
@@ -39,17 +39,25 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 +      if (WARN_ON(!parts))
 +              return 0;
 +
-+      err = add_mtd_partitions(&slave->mtd, parts, nr_parts);
++      for (i = 0; i < nr_parts; i++) {
++              /* adjust partition offsets */
++              parts[i].offset += slave->offset;
++
++              mtd_add_partition(slave->parent,
++                                parts[i].name,
++                                parts[i].offset,
++                                parts[i].size);
++      }
 +
 +      kfree(parts);
 +
-+      return err ? err : nr_parts;
++      return nr_parts;
 +}
 +
  #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
  #define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
  #else
-@@ -1122,6 +1148,61 @@ void mtd_part_parser_cleanup(struct mtd_
+@@ -1122,6 +1156,61 @@ void mtd_part_parser_cleanup(struct mtd_
        }
  }