Merge branch 'master' of git://git.denx.de/u-boot-ubi

This commit is contained in:
Tom Rini 2018-06-08 10:08:20 -04:00
commit 813d1fb56d

View File

@ -1250,7 +1250,7 @@ int ubi_init(void)
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);
if (mtd_devs > UBI_MAX_DEVICES) {
pr_err("UBI error: too many MTD devices, maximum is %d",
pr_err("UBI error: too many MTD devices, maximum is %d\n",
UBI_MAX_DEVICES);
return -EINVAL;
}
@ -1262,7 +1262,7 @@ int ubi_init(void)
err = misc_register(&ubi_ctrl_cdev);
if (err) {
pr_err("UBI error: cannot register device");
pr_err("UBI error: cannot register device\n");
goto out;
}
@ -1289,7 +1289,7 @@ int ubi_init(void)
mtd = open_mtd_device(p->name);
if (IS_ERR(mtd)) {
err = PTR_ERR(mtd);
pr_err("UBI error: cannot open mtd %s, error %d",
pr_err("UBI error: cannot open mtd %s, error %d\n",
p->name, err);
/* See comment below re-ubi_is_module(). */
if (ubi_is_module())
@ -1302,7 +1302,7 @@ int ubi_init(void)
p->vid_hdr_offs, p->max_beb_per1024);
mutex_unlock(&ubi_devices_mutex);
if (err < 0) {
pr_err("UBI error: cannot attach mtd%d",
pr_err("UBI error: cannot attach mtd%d\n",
mtd->index);
put_mtd_device(mtd);
@ -1326,7 +1326,7 @@ int ubi_init(void)
err = ubiblock_init();
if (err) {
pr_err("UBI error: block: cannot initialize, error %d", err);
pr_err("UBI error: block: cannot initialize, error %d\n", err);
/* See comment above re-ubi_is_module(). */
if (ubi_is_module())
@ -1353,7 +1353,7 @@ out:
mtd_devs = 0;
#endif
class_unregister(&ubi_class);
pr_err("UBI error: cannot initialize UBI, error %d", err);
pr_err("UBI error: cannot initialize UBI, error %d\n", err);
return err;
}
late_initcall(ubi_init);