[U-Boot] [PATCH] UBI: Return -ENOMEM upon failing malloc

[Stefan Roese]

Return with correct error code (-ENOMEM) from ubi_attach_mtd_dev() upon
failing malloc().

Thanks to Michael Lawnick for pointing this out.

Signed-off-by: Stefan Roese <[EMAIL PROTECTED]>
---
 drivers/mtd/ubi/build.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index bdf75c9..7feaff6 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -785,18 +785,24 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, 
int vid_hdr_offset)
                goto out_free;
 
        ubi->peb_buf1 = vmalloc(ubi->peb_size);
-       if (!ubi->peb_buf1)
+       if (!ubi->peb_buf1) {
+               err = -ENOMEM;
                goto out_free;
+       }
 
        ubi->peb_buf2 = vmalloc(ubi->peb_size);
-       if (!ubi->peb_buf2)
-                goto out_free;
+       if (!ubi->peb_buf2) {
+               err = -ENOMEM;
+               goto out_free;
+       }
 
 #ifdef CONFIG_MTD_UBI_DEBUG
        mutex_init(&ubi->dbg_buf_mutex);
        ubi->dbg_peb_buf = vmalloc(ubi->peb_size);
-       if (!ubi->dbg_peb_buf)
-                goto out_free;
+       if (!ubi->dbg_peb_buf) {
+               err = -ENOMEM;
+               goto out_free;
+       }
 #endif
 
        err = attach_by_scanning(ubi);
-- 
1.6.0.5

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot