aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 14:12:50 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 15:12:06 +0100
commit7b0e1d28e89e8932aa228ff2f37c274745eaa5e8 (patch)
treedfaded69f238608d359af5737be5bb5a817d0ff1 /target/linux/ipq40xx
parent386a57dc596c95919024e0726582a996d801d9fb (diff)
downloadupstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.gz
upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.bz2
upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.zip
kernel: bump 4.14 to 4.14.89
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ipq40xx')
-rw-r--r--target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
index 4ee79515c9..6a83d79d8c 100644
--- a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
+++ b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch
@@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1184,6 +1184,9 @@ static void __init ubi_auto_attach(void)
+@@ -1187,6 +1187,9 @@ static void __init ubi_auto_attach(void)
mtd = open_mtd_device("ubi");
if (IS_ERR(mtd))
mtd = open_mtd_device("data");
@@ -25,5 +25,5 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
+ if (IS_ERR(mtd))
+ mtd = open_mtd_device("UBI_DEV");
- if (!IS_ERR(mtd)) {
- size_t len;
+ if (IS_ERR(mtd))
+ return;