diff options
author | Daniel Golle <daniel@makrotopia.org> | 2023-04-15 01:35:17 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2023-04-15 03:34:22 +0100 |
commit | 34d2883b9d6fd4a3b3eb39d3fa90e8c281d36448 (patch) | |
tree | 426b07259ee8765ae5a8432d71dbc1122c75061c /target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | |
parent | e63b8443ab9f5edeba5b29c27f59015526cac0fd (diff) | |
download | upstream-34d2883b9d6fd4a3b3eb39d3fa90e8c281d36448.tar.gz upstream-34d2883b9d6fd4a3b3eb39d3fa90e8c281d36448.tar.bz2 upstream-34d2883b9d6fd4a3b3eb39d3fa90e8c281d36448.zip |
kernel: backport fix for recently introduced UBI bug
Import commit "ubi: Fix failure attaching when vid_hdr offset equals to
(sub)page size" which did not yet make it to stable upstream Linux trees.
Fixes: #12232
Fixes: #12339
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit aad34818b50029e07ed9221ae46f9770d6e29785)
Diffstat (limited to 'target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
-rw-r--r-- | target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index b21daea4f0..cc19a5e628 100644 --- a/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/pending-5.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1168,6 +1168,73 @@ static struct mtd_info * __init open_mtd +@@ -1177,6 +1177,73 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> static int __init ubi_init(void) { int err, i, k; -@@ -1251,6 +1318,12 @@ static int __init ubi_init(void) +@@ -1260,6 +1327,12 @@ static int __init ubi_init(void) } } |