aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-05-06 13:10:17 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-05-08 19:29:08 +0200
commit4b89b90d9fdd6f5bb6b41a0f61c90095e2857aa1 (patch)
tree804f9f4f0e55cbbf9512f9e10767b3be0d8d9942 /target/linux/lantiq
parent567ad2d434a464f80c278800050fb3a9b9c49c9a (diff)
downloadupstream-4b89b90d9fdd6f5bb6b41a0f61c90095e2857aa1.tar.gz
upstream-4b89b90d9fdd6f5bb6b41a0f61c90095e2857aa1.tar.bz2
upstream-4b89b90d9fdd6f5bb6b41a0f61c90095e2857aa1.zip
kernel: fix parsing fixed subpartitions
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit ed4641e9f1ad940cb60187dea09cf17c865efcaf)
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-5.4/0101-find_active_root.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-5.4/0101-find_active_root.patch b/target/linux/lantiq/patches-5.4/0101-find_active_root.patch
index 6e55ef9d7a..3f76535964 100644
--- a/target/linux/lantiq/patches-5.4/0101-find_active_root.patch
+++ b/target/linux/lantiq/patches-5.4/0101-find_active_root.patch
@@ -48,7 +48,7 @@
/* Pull of_node from the master device node */
mtd_node = mtd_get_of_node(master);
-@@ -93,7 +127,9 @@ static int parse_fixed_partitions(struct
+@@ -95,7 +129,9 @@ static int parse_fixed_partitions(struct
return 0;
parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
@@ -59,7 +59,7 @@
return -ENOMEM;
i = 0;
-@@ -142,6 +178,11 @@ static int parse_fixed_partitions(struct
+@@ -144,6 +180,11 @@ static int parse_fixed_partitions(struct
if (of_get_property(pp, "lock", &len))
parts[i].mask_flags |= MTD_POWERUP_LOCK;
@@ -71,7 +71,7 @@
i++;
}
-@@ -151,6 +192,11 @@ static int parse_fixed_partitions(struct
+@@ -153,6 +194,11 @@ static int parse_fixed_partitions(struct
if (quirks && quirks->post_parse)
quirks->post_parse(master, parts, nr_parts);
@@ -83,7 +83,7 @@
*pparts = parts;
return nr_parts;
-@@ -161,6 +207,7 @@ ofpart_fail:
+@@ -163,6 +209,7 @@ ofpart_fail:
ofpart_none:
of_node_put(pp);
kfree(parts);