---

yaml --- r: 201815 b: refs/heads/master c: f5d5b1f h: refs/heads/master i: 201813: 0ba9bd7 201811: f2def2d 201807: 61db427 v: v3
git-mirror · Jun 14, 2010 · 38158b5 · 38158b5
1 parent 5b4b0c4
commit 38158b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 095751a6e0838a712393a74eb0b7b6559dbdbe81
+refs/heads/master: f5d5b1f8c12a7637ee1145f2f00358eb375edb54
diff --git a/trunk/drivers/mtd/ubi/io.c b/trunk/drivers/mtd/ubi/io.c
@@ -150,7 +150,7 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,
 retry:
 	err = ubi->mtd->read(ubi->mtd, addr, len, &read, buf);
 	if (err) {
-		const char errstr = (err == -EBADMSG) ? "ECC error" : "";
+		const char *errstr = (err == -EBADMSG) ? " (ECC error)" : "";
 
 		if (err == -EUCLEAN) {
 			/*
@@ -174,7 +174,7 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,
 			goto retry;
 		}
 
-		ubi_err("error %d while reading %d bytes from PEB %d:%d, "
+		ubi_err("error %d%s while reading %d bytes from PEB %d:%d, "
 			"read %zd bytes", err, errstr, len, pnum, offset, read);
 		ubi_dbg_dump_stack();
 

diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/scan.c
@@ -901,8 +901,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
  * MTD device. Returns zero if we should proceed with attaching the MTD device,
  * and %-EINVAL if we should not.
  */
-static int check_what_we_have(const struct ubi_device *ubi,
-			      struct ubi_scan_info *si)
+static int check_what_we_have(struct ubi_device *ubi, struct ubi_scan_info *si)
 {
 	struct ubi_scan_leb *seb;
 	int max_corr;