Skip to content
Snippets Groups Projects
Commit 813d1fb5 authored by Tom Rini's avatar Tom Rini
Browse files

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

parents 8da19df5 78306cba
No related branches found
No related tags found
No related merge requests found
...@@ -1250,7 +1250,7 @@ int ubi_init(void) ...@@ -1250,7 +1250,7 @@ int ubi_init(void)
BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64); BUILD_BUG_ON(sizeof(struct ubi_vid_hdr) != 64);
if (mtd_devs > UBI_MAX_DEVICES) { 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); UBI_MAX_DEVICES);
return -EINVAL; return -EINVAL;
} }
...@@ -1262,7 +1262,7 @@ int ubi_init(void) ...@@ -1262,7 +1262,7 @@ int ubi_init(void)
err = misc_register(&ubi_ctrl_cdev); err = misc_register(&ubi_ctrl_cdev);
if (err) { if (err) {
pr_err("UBI error: cannot register device"); pr_err("UBI error: cannot register device\n");
goto out; goto out;
} }
...@@ -1289,7 +1289,7 @@ int ubi_init(void) ...@@ -1289,7 +1289,7 @@ int ubi_init(void)
mtd = open_mtd_device(p->name); mtd = open_mtd_device(p->name);
if (IS_ERR(mtd)) { if (IS_ERR(mtd)) {
err = PTR_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); p->name, err);
/* See comment below re-ubi_is_module(). */ /* See comment below re-ubi_is_module(). */
if (ubi_is_module()) if (ubi_is_module())
...@@ -1302,7 +1302,7 @@ int ubi_init(void) ...@@ -1302,7 +1302,7 @@ int ubi_init(void)
p->vid_hdr_offs, p->max_beb_per1024); p->vid_hdr_offs, p->max_beb_per1024);
mutex_unlock(&ubi_devices_mutex); mutex_unlock(&ubi_devices_mutex);
if (err < 0) { if (err < 0) {
pr_err("UBI error: cannot attach mtd%d", pr_err("UBI error: cannot attach mtd%d\n",
mtd->index); mtd->index);
put_mtd_device(mtd); put_mtd_device(mtd);
...@@ -1326,7 +1326,7 @@ int ubi_init(void) ...@@ -1326,7 +1326,7 @@ int ubi_init(void)
err = ubiblock_init(); err = ubiblock_init();
if (err) { 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(). */ /* See comment above re-ubi_is_module(). */
if (ubi_is_module()) if (ubi_is_module())
...@@ -1353,7 +1353,7 @@ out: ...@@ -1353,7 +1353,7 @@ out:
mtd_devs = 0; mtd_devs = 0;
#endif #endif
class_unregister(&ubi_class); 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; return err;
} }
late_initcall(ubi_init); late_initcall(ubi_init);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment