summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2013-09-28 15:55:11 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-01-07 11:03:24 +0100
commit4a290f970d59086d453e6b8a701107b2ebf6e15d (patch)
treeae2be87fde70d43e968ea25f9388a4f5cd5e428a /drivers
parentf0986b6f709de6ce76a1b7717aec07853239e1cf (diff)
downloadbarebox-4a290f970d59086d453e6b8a701107b2ebf6e15d.tar.gz
barebox-4a290f970d59086d453e6b8a701107b2ebf6e15d.tar.xz
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 <richard.genoud@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/ubi/fastmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 4d120ae83e..0a343fd9ae 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -427,7 +427,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;
}