Skip to content

Commit

Permalink
UBI: fix error return code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julia Lawall authored and Artem Bityutskiy committed Jan 2, 2014
1 parent 802eee9 commit 4d52514
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion drivers/mtd/ubi/attach.c
Original file line number Diff line number Diff line change
Expand Up @@ -1453,8 +1453,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) {
Expand Down
4 changes: 3 additions & 1 deletion drivers/mtd/ubi/build.c
Original file line number Diff line number Diff line change
Expand Up @@ -1245,8 +1245,10 @@ static int __init ubi_init(void)
ubi_wl_entry_slab = kmem_cache_create("ubi_wl_entry_slab",
sizeof(struct ubi_wl_entry),
0, 0, NULL);
if (!ubi_wl_entry_slab)
if (!ubi_wl_entry_slab) {
err = -ENOMEM;
goto out_dev_unreg;
}

err = ubi_debugfs_init();
if (err)
Expand Down

0 comments on commit 4d52514

Please sign in to comment.