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

[librecmc/librecmc.git] / target / linux / generic / patches-4.0 / 490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

diff --git a/target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 8d391474d2e6e7860095b2cae19ec7897c056778..bb28538d386ae188eed400c7acaa2c8256e20305 100644 (file)
--- a/target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +              /* check for a valid ubi magic */
 +              err = mtd_read(mtd, 0, 4, &len, (void *) magic);
 +              if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
-+                      ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
++                      pr_err("UBI error: no valid UBI magic found inside mtd%d", mtd->index);
 +                      put_mtd_device(mtd);
 +                      return;
 +              }
@@ -47,11 +47,11 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 +                  mtd->type == MTD_DATAFLASH ||
 +                  mtd->type == MTD_MLCNANDFLASH) {
 +                      mutex_lock(&ubi_devices_mutex);
-+                      ubi_msg("auto-attach mtd%d", mtd->index);
++                      pr_notice("UBI: auto-attach mtd%d", mtd->index);
 +                      err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
 +                      mutex_unlock(&ubi_devices_mutex);
 +                      if (err < 0) {
-+                              ubi_err("cannot attach mtd%d", mtd->index);
++                              pr_err("UBI error: cannot attach mtd%d", mtd->index);
 +                              put_mtd_device(mtd);
 +                      }
 +              }