Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 305150
b: refs/heads/master
c: f01e2d1
h: refs/heads/master
v: v3
  • Loading branch information
Artem Bityutskiy committed May 20, 2012
1 parent 09d1aef commit 7c53b2f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a904e3f1deb21b986b7789a830fa8f132ff3d406
refs/heads/master: f01e2d1654dc65792674b3fe5403dbfcce43f9d2
12 changes: 6 additions & 6 deletions trunk/drivers/mtd/ubi/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,
}

if (retries++ < UBI_IO_RETRIES) {
dbg_io("error %d%s while reading %d bytes from PEB "
"%d:%d, read only %zd bytes, retry",
err, errstr, len, pnum, offset, read);
ubi_warn("error %d%s while reading %d bytes from PEB "
"%d:%d, read only %zd bytes, retry",
err, errstr, len, pnum, offset, read);
yield();
goto retry;
}
Expand Down Expand Up @@ -364,8 +364,8 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)
err = mtd_erase(ubi->mtd, &ei);
if (err) {
if (retries++ < UBI_IO_RETRIES) {
dbg_io("error %d while erasing PEB %d, retry",
err, pnum);
ubi_warn("error %d while erasing PEB %d, retry",
err, pnum);
yield();
goto retry;
}
Expand All @@ -383,7 +383,7 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)

if (ei.state == MTD_ERASE_FAILED) {
if (retries++ < UBI_IO_RETRIES) {
dbg_io("error while erasing PEB %d, retry", pnum);
ubi_warn("error while erasing PEB %d, retry", pnum);
yield();
goto retry;
}
Expand Down

0 comments on commit 7c53b2f

Please sign in to comment.