1 files changed, 22 insertions, 24 deletions

diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index bd27cbbb4066..f7adf53e4f45 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -79,7 +79,7 @@
  *     NAND), it is probably a PEB which was being erased when power cut
  *     happened, so this is corruption type 1. However, this is just a guess,
  *     which might be wrong.
- *   o Otherwise this it corruption type 2.
+ *   o Otherwise this is corruption type 2.
  */
 
 #include <linux/err.h>
@@ -378,8 +378,8 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_ainf_peb *aeb,
                         if (err == UBI_IO_BITFLIPS)
                                 bitflips = 1;
                         else {
-                                ubi_err("VID of PEB %d header is bad, but it "
-                                        "was OK earlier, err %d", pnum, err);
+                                ubi_err("VID of PEB %d header is bad, but it was OK earlier, err %d",
+                                        pnum, err);
                                 if (err > 0)
                                         err = -EIO;
 
@@ -790,12 +790,12 @@ static int check_corruption(struct ubi_device *ubi, struct ubi_vid_hdr *vid_hdr,
         if (ubi_check_pattern(ubi->peb_buf, 0xFF, ubi->leb_size))
                 goto out_unlock;
 
-        ubi_err("PEB %d contains corrupted VID header, and the data does not "
-                "contain all 0xFF, this may be a non-UBI PEB or a severe VID "
-                "header corruption which requires manual inspection", pnum);
+        ubi_err("PEB %d contains corrupted VID header, and the data does not contain all 0xFF",
+                pnum);
+        ubi_err("this may be a non-UBI PEB or a severe VID header corruption which requires manual inspection");
         ubi_dump_vid_hdr(vid_hdr);
-        dbg_msg("hexdump of PEB %d offset %d, length %d",
-                pnum, ubi->leb_start, ubi->leb_size);
+        pr_err("hexdump of PEB %d offset %d, length %d",
+               pnum, ubi->leb_start, ubi->leb_size);
         ubi_dbg_print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
                                ubi->peb_buf, ubi->leb_size, 1);
         err = 1;
@@ -907,8 +907,8 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                         ubi->image_seq = image_seq;
                 if (ubi->image_seq && image_seq &&
                     ubi->image_seq != image_seq) {
-                        ubi_err("bad image sequence number %d in PEB %d, "
-                                "expected %d", image_seq, pnum, ubi->image_seq);
+                        ubi_err("bad image sequence number %d in PEB %d, expected %d",
+                                image_seq, pnum, ubi->image_seq);
                         ubi_dump_ec_hdr(ech);
                         return -EINVAL;
                 }
@@ -975,7 +975,7 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                         return err;
                 goto adjust_mean_ec;
         case UBI_IO_FF:
-                if (ec_err)
+                if (ec_err || bitflips)
                         err = add_to_list(ai, pnum, UBI_UNKNOWN,
                                           UBI_UNKNOWN, ec, 1, &ai->erase);
                 else
@@ -997,8 +997,8 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                 /* Unsupported internal volume */
                 switch (vidh->compat) {
                 case UBI_COMPAT_DELETE:
-                        ubi_msg("\"delete\" compatible internal volume %d:%d"
-                                " found, will remove it", vol_id, lnum);
+                        ubi_msg("\"delete\" compatible internal volume %d:%d found, will remove it",
+                                vol_id, lnum);
                         err = add_to_list(ai, pnum, vol_id, lnum,
                                           ec, 1, &ai->erase);
                         if (err)
@@ -1006,15 +1006,14 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
                         return 0;
 
                 case UBI_COMPAT_RO:
-                        ubi_msg("read-only compatible internal volume %d:%d"
-                                " found, switch to read-only mode",
+                        ubi_msg("read-only compatible internal volume %d:%d found, switch to read-only mode",
                                 vol_id, lnum);
                         ubi->ro_mode = 1;
                         break;
 
                 case UBI_COMPAT_PRESERVE:
-                        ubi_msg("\"preserve\" compatible internal volume %d:%d"
-                                " found", vol_id, lnum);
+                        ubi_msg("\"preserve\" compatible internal volume %d:%d found",
+                                vol_id, lnum);
                         err = add_to_list(ai, pnum, vol_id, lnum,
                                           ec, 0, &ai->alien);
                         if (err)
@@ -1075,10 +1074,10 @@ static int late_analysis(struct ubi_device *ubi, struct ubi_attach_info *ai)
         if (ai->corr_peb_count) {
                 ubi_err("%d PEBs are corrupted and preserved",
                         ai->corr_peb_count);
-                printk(KERN_ERR "Corrupted PEBs are:");
+                pr_err("Corrupted PEBs are:");
                 list_for_each_entry(aeb, &ai->corr, u.list)
-                        printk(KERN_CONT " %d", aeb->pnum);
-                printk(KERN_CONT "\n");
+                        pr_cont(" %d", aeb->pnum);
+                pr_cont("\n");
 
                 /*
                  * If too many PEBs are corrupted, we refuse attaching,
@@ -1112,8 +1111,7 @@ static int late_analysis(struct ubi_device *ubi, struct ubi_attach_info *ai)
                         get_random_bytes(&ubi->image_seq,
                                          sizeof(ubi->image_seq));
                 } else {
-                        ubi_err("MTD device is not UBI-formatted and possibly "
-                                "contains non-UBI data - refusing it");
+                        ubi_err("MTD device is not UBI-formatted and possibly contains non-UBI data - refusing it");
                         return -EINVAL;
                 }
 
@@ -1172,7 +1170,7 @@ static struct ubi_attach_info *scan_all(struct ubi_device *ubi)
                         goto out_vidh;
         }
 
-        dbg_msg("scanning is finished");
+        ubi_msg("scanning is finished");
 
         /* Calculate mean erase counter */
         if (ai->ec_count)
@@ -1244,7 +1242,7 @@ int ubi_attach(struct ubi_device *ubi)
         ubi->corr_peb_count = ai->corr_peb_count;
         ubi->max_ec = ai->max_ec;
         ubi->mean_ec = ai->mean_ec;
-        ubi_msg("max. sequence number:       %llu", ai->max_sqnum);
+        dbg_gen("max. sequence number:       %llu", ai->max_sqnum);
 
         err = ubi_read_volume_table(ubi, ai);
         if (err)