summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-12-29 23:47:19 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-11 15:53:24 +0200
commit1c8847c13f9c5fbc850e33e3d4baa26a35537804 (patch)
treedee94d38a18c26ff64c3c9d0c75aac99f7fec83d
parent1202e6e83cb238bcfc15ed09272f62b0643cfc4f (diff)
downloadbarebox-1c8847c13f9c5fbc850e33e3d4baa26a35537804.tar.gz
barebox-1c8847c13f9c5fbc850e33e3d4baa26a35537804.tar.xz
UBI: fix error return code
Set the return variable to an error code as done elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Reviewed-by: Richard Weinberger <richard@nod.at>
-rw-r--r--drivers/mtd/ubi/attach.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 54129748e..d6fe43b83 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -1429,8 +1429,10 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
struct ubi_attach_info *scan_ai;
scan_ai = alloc_ai("ubi_ckh_aeb_slab_cache");
- if (!scan_ai)
+ if (!scan_ai) {
+ err = -ENOMEM;
goto out_wl;
+ }
err = scan_all(ubi, scan_ai, 0);
if (err) {