From 0ba9bd7a67c77f71e8c0409aa33ea89092f88cc6 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Tue, 8 Jun 2010 10:59:07 +0300 Subject: [PATCH] --- yaml --- r: 201813 b: refs/heads/master c: 1a49af2ca019dcb4614c32f832bbcb814b61409c h: refs/heads/master i: 201811: f2def2d27dc91f26910d7d0e678c7ab3ea1207ef v: v3 --- [refs] | 2 +- trunk/drivers/mtd/ubi/io.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 62984c3924c4..363534975e93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0798cea8c2e1afee59686c51d27d0e96b05e42d1 +refs/heads/master: 1a49af2ca019dcb4614c32f832bbcb814b61409c diff --git a/trunk/drivers/mtd/ubi/io.c b/trunk/drivers/mtd/ubi/io.c index b812f8805367..ffb230339558 100644 --- a/trunk/drivers/mtd/ubi/io.c +++ b/trunk/drivers/mtd/ubi/io.c @@ -150,6 +150,8 @@ 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" : ""; + if (err == -EUCLEAN) { /* * -EUCLEAN is reported if there was a bit-flip which @@ -165,15 +167,15 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset, } if (read != len && retries++ < UBI_IO_RETRIES) { - dbg_io("error %d while reading %d bytes from PEB %d:%d," + dbg_io("error %d%s while reading %d bytes from PEB %d:%d," " read only %zd bytes, retry", - err, len, pnum, offset, read); + err, errstr, len, pnum, offset, read); yield(); goto retry; } ubi_err("error %d while reading %d bytes from PEB %d:%d, " - "read %zd bytes", err, len, pnum, offset, read); + "read %zd bytes", err, errstr, len, pnum, offset, read); ubi_dbg_dump_stack(); /*