diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2021-05-06 13:10:17 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2021-05-06 14:53:25 +0200 |
| commit | ed4641e9f1ad940cb60187dea09cf17c865efcaf (patch) | |
| tree | 5d4ce4d5bfd5e9277487b2d67479fcbd2d841d2c /target/linux/lantiq | |
| parent | dfef88b6cacceec151ca4ce4bb3dc50c1c5cf1d2 (diff) | |
| download | upstream-ed4641e9f1ad940cb60187dea09cf17c865efcaf.tar.gz upstream-ed4641e9f1ad940cb60187dea09cf17c865efcaf.tar.bz2 upstream-ed4641e9f1ad940cb60187dea09cf17c865efcaf.zip | |
kernel: fix parsing fixed subpartitions
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches-5.10/0101-find_active_root.patch | 8 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-5.4/0101-find_active_root.patch | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-5.10/0101-find_active_root.patch b/target/linux/lantiq/patches-5.10/0101-find_active_root.patch index 14c33e31a6..925ac9dbba 100644 --- a/target/linux/lantiq/patches-5.10/0101-find_active_root.patch +++ b/target/linux/lantiq/patches-5.10/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; -@@ -145,6 +181,11 @@ static int parse_fixed_partitions(struct +@@ -147,6 +183,11 @@ static int parse_fixed_partitions(struct if (of_property_read_bool(pp, "slc-mode")) parts[i].add_flags |= MTD_SLC_ON_MLC_EMULATION; @@ -71,7 +71,7 @@ i++; } -@@ -154,6 +195,11 @@ static int parse_fixed_partitions(struct +@@ -156,6 +197,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; -@@ -164,6 +210,7 @@ ofpart_fail: +@@ -166,6 +212,7 @@ ofpart_fail: ofpart_none: of_node_put(pp); kfree(parts); 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); |