kernel: bump 4.14 to 4.14.59

[openwrt/openwrt.git] / target / linux / ipq40xx / patches-4.14 / 400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch

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 4ee79515c9a8dac1c635d7e57565ec5edea6e8ef..6a83d79d8c37551862a6a6791d69ecc65fcd4a1d 100644 (file)
--- 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;