ubi: pr_err() strings should end with newlines
The ubi_init() function has a few error paths that use the pr_err() to output errors. These should have new lines on them as pr_err() does not automatically do this. This fixes issues where if multiple mtd fail to bind to ubi the console output starts wrapping around. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
569dbb88e8
commit
278f31a70d
|
@ -1166,7 +1166,7 @@ static int __init 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;
|
||||
}
|
||||
|
@ -1178,7 +1178,7 @@ static int __init 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;
|
||||
}
|
||||
|
||||
|
@ -1205,7 +1205,7 @@ static int __init 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())
|
||||
|
@ -1218,7 +1218,7 @@ static int __init 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);
|
||||
|
||||
|
@ -1242,7 +1242,7 @@ static int __init 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())
|
||||
|
@ -1265,7 +1265,7 @@ out_dev_unreg:
|
|||
misc_deregister(&ubi_ctrl_cdev);
|
||||
out:
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue