generic/4.0: the ubi patches has been fixed in the 3.19 patchset already

[librecmc/librecmc.git] / target / linux / generic / patches-4.0 / 491-ubi-auto-create-ubiblock-device-for-rootfs.patch

diff --git a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
index 5aafea7366902cd4ffe0d2dcddbc417edfa901b9..c0ee1f7673fd18e2930c80c0cca559a675a81bf6 100644 (file)
--- a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
+++ b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -11,8 +11,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/block.c
 +++ b/drivers/mtd/ubi/block.c
-@@ -614,6 +614,44 @@ static void __init ubiblock_create_from_
-       }
+@@ -614,6 +614,44 @@ static int __init ubiblock_create_from_p
+       return ret;
  }
  
 +#define UBIFS_NODE_MAGIC  0x06101831
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +
 +              ret = ubiblock_create(&vi);
 +              if (ret)
-+                      ubi_err("block: can't add '%s' volume, err=%d\n",
++                      pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
 +                              vi.name, ret);
 +              /* always break if we get here */
 +              break;
@@ -57,8 +57,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  {
        struct ubiblock *next;
 @@ -644,6 +682,10 @@ int __init ubiblock_init(void)
-        */
-       ubiblock_create_from_param();
+       if (ret)
+               goto err_remove;
  
 +      /* auto-attach "rootfs" volume if existing and non-ubifs */
 +      if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))