| From 7233982ade15eeac05c6f351e8d347406e6bcd2f Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| Date: Thu, 18 Jan 2018 14:05:05 +0000 |
| Subject: mtd: ubi: wl: Fix error return code in ubi_wl_init() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| commit 7233982ade15eeac05c6f351e8d347406e6bcd2f upstream. |
| |
| Fix to return error code -ENOMEM from the kmem_cache_alloc() error |
| handling case instead of 0, as done elsewhere in this function. |
| |
| Fixes: f78e5623f45b ("ubi: fastmap: Erase outdated anchor PEBs during |
| attach") |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Cc: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mtd/ubi/wl.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/mtd/ubi/wl.c |
| +++ b/drivers/mtd/ubi/wl.c |
| @@ -1615,8 +1615,10 @@ int ubi_wl_init(struct ubi_device *ubi, |
| cond_resched(); |
| |
| e = kmem_cache_alloc(ubi_wl_entry_slab, GFP_KERNEL); |
| - if (!e) |
| + if (!e) { |
| + err = -ENOMEM; |
| goto out_free; |
| + } |
| |
| e->pnum = aeb->pnum; |
| e->ec = aeb->ec; |
| @@ -1635,8 +1637,10 @@ int ubi_wl_init(struct ubi_device *ubi, |
| cond_resched(); |
| |
| e = kmem_cache_alloc(ubi_wl_entry_slab, GFP_KERNEL); |
| - if (!e) |
| + if (!e) { |
| + err = -ENOMEM; |
| goto out_free; |
| + } |
| |
| e->pnum = aeb->pnum; |
| e->ec = aeb->ec; |