From: Stefan Roese <sr@denx.de>
Date: Wed, 10 Dec 2008 09:28:33 +0000 (+0100)
Subject: UBI: Return -ENOMEM upon failing malloc
X-Git-Tag: v2009.01-rc1~9^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=817329351639a8895cd9b87b33aeff043f3d5a44;p=oweals%2Fu-boot.git

UBI: Return -ENOMEM upon failing malloc

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

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index bdf75c98a1..f4b01a9ded 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);