aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-05-12 23:12:32 +0200
committerRafał Miłecki <rafal@milecki.pl>2018-05-12 23:14:07 +0200
commit070693477a26a40fdf5de2316bc72073dc9930c1 (patch)
treedb8071cc5729875696f356c1da9b18cfe63cda71 /target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
parenta3096b4b33dcc5fcc07b229346ef337aa5962019 (diff)
downloadupstream-070693477a26a40fdf5de2316bc72073dc9930c1.tar.gz
upstream-070693477a26a40fdf5de2316bc72073dc9930c1.tar.bz2
upstream-070693477a26a40fdf5de2316bc72073dc9930c1.zip
kernel: backport mtd patch for minor partitioning cleanup
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
-rw-r--r--target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch8
1 files changed, 4 insertions, 4 deletions
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 5f0fa3a418..e2a0e4887d 100644
--- 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;
}