ubi: Fix early logging
commit bc743f34dfa011e62edd0ea4ae8455be06c083b5 upstream.
We cannot use ubi_* logging functions before the UBI
object is initialized.
Fixes: 3260870331
("UBI: Extend UBI layer debug/messaging capabilities")
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
752aaae53d
commit
79d6bc128c
1 changed files with 4 additions and 4 deletions
|
@ -869,7 +869,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
|
|||
for (i = 0; i < UBI_MAX_DEVICES; i++) {
|
||||
ubi = ubi_devices[i];
|
||||
if (ubi && mtd->index == ubi->mtd->index) {
|
||||
ubi_err(ubi, "mtd%d is already attached to ubi%d",
|
||||
pr_err("ubi: mtd%d is already attached to ubi%d",
|
||||
mtd->index, i);
|
||||
return -EEXIST;
|
||||
}
|
||||
|
@ -884,7 +884,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
|
|||
* no sense to attach emulated MTD devices, so we prohibit this.
|
||||
*/
|
||||
if (mtd->type == MTD_UBIVOLUME) {
|
||||
ubi_err(ubi, "refuse attaching mtd%d - it is already emulated on top of UBI",
|
||||
pr_err("ubi: refuse attaching mtd%d - it is already emulated on top of UBI",
|
||||
mtd->index);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -895,7 +895,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
|
|||
if (!ubi_devices[ubi_num])
|
||||
break;
|
||||
if (ubi_num == UBI_MAX_DEVICES) {
|
||||
ubi_err(ubi, "only %d UBI devices may be created",
|
||||
pr_err("ubi: only %d UBI devices may be created",
|
||||
UBI_MAX_DEVICES);
|
||||
return -ENFILE;
|
||||
}
|
||||
|
@ -905,7 +905,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
|
|||
|
||||
/* Make sure ubi_num is not busy */
|
||||
if (ubi_devices[ubi_num]) {
|
||||
ubi_err(ubi, "already exists");
|
||||
pr_err("ubi: ubi%i already exists", ubi_num);
|
||||
return -EEXIST;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue