From 38158b5a0433a8ee04cfd0f99a4b307b66fea1f8 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 14 Jun 2010 08:15:39 +0300 Subject: [PATCH] --- yaml --- r: 201815 b: refs/heads/master c: f5d5b1f8c12a7637ee1145f2f00358eb375edb54 h: refs/heads/master i: 201813: 0ba9bd7a67c77f71e8c0409aa33ea89092f88cc6 201811: f2def2d27dc91f26910d7d0e678c7ab3ea1207ef 201807: 61db42715325b37a6908d7dd2e05580c7e8e229e v: v3 --- [refs] | 2 +- trunk/drivers/mtd/ubi/io.c | 4 ++-- trunk/drivers/mtd/ubi/scan.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0cd901dd2f8d..7eefc4fda763 100644 --- 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 index ffb230339558..332f992f13d9 100644 --- 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 index de7b2f1c4113..37855e55651f 100644 --- 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;