From: Richard Weinberger Date: Sat, 28 Sep 2013 13:55:11 +0000 (+0200) Subject: UBI: Fix error path in scan_pool() X-Git-Tag: upstream/snapshot3+hdmi~3998^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f240dca8f2fdf11d52a7bacd867e274c3b21a7d3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git UBI: Fix error path in scan_pool() We have to set "ret", not "err" in case of an error. Reported-and-tested-by: Richard Genoud Signed-off-by: Richard Weinberger Signed-off-by: Artem Bityutskiy --- diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index f5aa4b0..9b42add 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -428,7 +428,7 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, if (be32_to_cpu(ech->image_seq) != ubi->image_seq) { ubi_err("bad image seq: 0x%x, expected: 0x%x", be32_to_cpu(ech->image_seq), ubi->image_seq); - err = UBI_BAD_FASTMAP; + ret = UBI_BAD_FASTMAP; goto out; }