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

Commit c4506092 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: fix error printing 



Use existing ubi_err() as the rest of the code does.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 92a74f1c

drivers/mtd/ubi/build.c

+8 −10
Original line number Diff line number Diff line
@@ -950,8 +950,7 @@ static int __init ubi_init(void) 
	BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);



	if (mtd_devs > UBI_MAX_DEVICES) {

		printk(KERN_ERR "UBI error: too many MTD devices, "

		       "maximum is %d\n", UBI_MAX_DEVICES);

		ubi_err("too many MTD devices, maximum is %d", UBI_MAX_DEVICES);

		return -EINVAL;

	}
@@ -959,19 +958,19 @@ static int __init ubi_init(void) 
	ubi_class = class_create(THIS_MODULE, UBI_NAME_STR);

	if (IS_ERR(ubi_class)) {

		err = PTR_ERR(ubi_class);

		printk(KERN_ERR "UBI error: cannot create UBI class\n");

		ubi_err("cannot create UBI class");

		goto out;

	}



	err = class_create_file(ubi_class, &ubi_version);

	if (err) {

		printk(KERN_ERR "UBI error: cannot create sysfs file\n");

		ubi_err("cannot create sysfs file");

		goto out_class;

	}



	err = misc_register(&ubi_ctrl_cdev);

	if (err) {

		printk(KERN_ERR "UBI error: cannot register device\n");

		ubi_err("cannot register device");

		goto out_version;

	}
@@ -1000,8 +999,7 @@ static int __init ubi_init(void) 
		mutex_unlock(&ubi_devices_mutex);

		if (err < 0) {

			put_mtd_device(mtd);

			printk(KERN_ERR "UBI error: cannot attach mtd%d\n",

			       mtd->index);

			ubi_err("cannot attach mtd%d", mtd->index);

			goto out_detach;

		}

	}
@@ -1023,7 +1021,7 @@ static int __init ubi_init(void) 
out_class:

	class_destroy(ubi_class);

out:

	printk(KERN_ERR "UBI error: cannot initialize UBI, error %d\n", err);

	ubi_err("UBI error: cannot initialize UBI, error %d", err);

	return err;

}

module_init(ubi_init);