Message ID | 1411375536-20067-1-git-send-email-richard@nod.at |
---|---|
State | Accepted |
Headers | show |
On Mon, 2014-09-22 at 10:45 +0200, Richard Weinberger wrote: > There is no need to set err, it will be overwritten in any case > later at: > if (scrub) > err = ubi_wl_scrub_peb(ubi, pnum); > > Signed-off-by: Richard Weinberger <richard@nod.at> Pushed the first 2 patches, thanks!
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 0e11671d..2402d3b 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -441,10 +441,9 @@ retry: err = ubi_io_read_data(ubi, buf, pnum, offset, len); if (err) { - if (err == UBI_IO_BITFLIPS) { + if (err == UBI_IO_BITFLIPS) scrub = 1; - err = 0; - } else if (mtd_is_eccerr(err)) { + else if (mtd_is_eccerr(err)) { if (vol->vol_type == UBI_DYNAMIC_VOLUME) goto out_unlock; scrub = 1;
There is no need to set err, it will be overwritten in any case later at: if (scrub) err = ubi_wl_scrub_peb(ubi, pnum); Signed-off-by: Richard Weinberger <richard@nod.at> --- drivers/mtd/ubi/eba.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)