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

Stefan Roese sr at denx.de
Wed Dec 10 12:58:24 CET 2008


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 <sr at denx.de>
---
v2:
- Slightly improved version

 drivers/mtd/ubi/build.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index bdf75c9..f4b01a9 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -784,19 +784,20 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset)
 	if (err)
 		goto out_free;
 
+	err = -ENOMEM;
 	ubi->peb_buf1 = vmalloc(ubi->peb_size);
 	if (!ubi->peb_buf1)
 		goto out_free;
 
 	ubi->peb_buf2 = vmalloc(ubi->peb_size);
 	if (!ubi->peb_buf2)
-		 goto out_free;
+		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;
+		goto out_free;
 #endif
 
 	err = attach_by_scanning(ubi);
-- 
1.6.0.5



More information about the U-Boot mailing list