Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc743f34 authored by Richard Weinberger's avatar Richard Weinberger
Browse files

ubi: Fix early logging 



We cannot use ubi_* logging functions before the UBI
object is initialized.

Cc: <stable@vger.kernel.org>
Fixes: 32608703 ("UBI: Extend UBI layer debug/messaging capabilities")
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 95b54e1e

drivers/mtd/ubi/build.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -874,7 +874,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
	for (i = 0; i < UBI_MAX_DEVICES; i++) {

	for (i = 0; i < UBI_MAX_DEVICES; i++) {

		ubi = ubi_devices[i];

		ubi = ubi_devices[i];

		if (ubi && mtd->index == ubi->mtd->index) {

		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);

				mtd->index, i);

			return -EEXIST;

			return -EEXIST;

		}

		}
@@ -889,7 +889,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
	 * no sense to attach emulated MTD devices, so we prohibit this.

	 * no sense to attach emulated MTD devices, so we prohibit this.

	 */

	 */

	if (mtd->type == MTD_UBIVOLUME) {

	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);

			mtd->index);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -900,7 +900,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
			if (!ubi_devices[ubi_num])

			if (!ubi_devices[ubi_num])

				break;

				break;

		if (ubi_num == UBI_MAX_DEVICES) {

		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);

				UBI_MAX_DEVICES);

			return -ENFILE;

			return -ENFILE;

		}

		}
@@ -910,7 +910,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 




		/* Make sure ubi_num is not busy */

		/* Make sure ubi_num is not busy */

		if (ubi_devices[ubi_num]) {

		if (ubi_devices[ubi_num]) {

			ubi_err(ubi, "already exists");

			pr_err("ubi: ubi%i already exists", ubi_num);

			return -EEXIST;

			return -EEXIST;

		}

		}

	}

	}