diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-24 18:27:49 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-24 18:27:49 +0000 |
| commit | efea65bb9956068414a53d8dad840aa60bf5201b (patch) | |
| tree | 73bb349d56f3d0a71bab9b52beb20f5cf65c73c0 /target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | |
| parent | e67f5ed2e61d3fc9267086a5d7e75a6828ea14c0 (diff) | |
| download | master-31e0f0ae-efea65bb9956068414a53d8dad840aa60bf5201b.tar.gz master-31e0f0ae-efea65bb9956068414a53d8dad840aa60bf5201b.tar.bz2 master-31e0f0ae-efea65bb9956068414a53d8dad840aa60bf5201b.zip | |
generic/4.0: the ubi patches has been fixed in the 3.19 patchset already
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44529
Diffstat (limited to 'target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 8d391474d2..bb28538d38 100644 --- 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); + } + } |