diff options
author | Stefan Roese <sr@denx.de> | 2008-12-10 04:42:54 -0500 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-12-10 07:28:48 -0500 |
commit | ad5942bad6addcf9697a74413b517d9724d803a4 (patch) | |
tree | efaf29500212d1ae0be78377e9aa3cc607959719 /drivers/mtd | |
parent | 8e26e1d7bce73acf6f995a4d252610e46ee831a5 (diff) |
UBI: return -ENOMEM upon failing vmalloc
Return with correct error code (-ENOMEM) from ubi_attach_mtd_dev() upon
failing vmalloc().
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | 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 c7630a228310..ba0bd3d5775b 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c | |||
@@ -815,19 +815,20 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset) | |||
815 | if (err) | 815 | if (err) |
816 | goto out_free; | 816 | goto out_free; |
817 | 817 | ||
818 | err = -ENOMEM; | ||
818 | ubi->peb_buf1 = vmalloc(ubi->peb_size); | 819 | ubi->peb_buf1 = vmalloc(ubi->peb_size); |
819 | if (!ubi->peb_buf1) | 820 | if (!ubi->peb_buf1) |
820 | goto out_free; | 821 | goto out_free; |
821 | 822 | ||
822 | ubi->peb_buf2 = vmalloc(ubi->peb_size); | 823 | ubi->peb_buf2 = vmalloc(ubi->peb_size); |
823 | if (!ubi->peb_buf2) | 824 | if (!ubi->peb_buf2) |
824 | goto out_free; | 825 | goto out_free; |
825 | 826 | ||
826 | #ifdef CONFIG_MTD_UBI_DEBUG | 827 | #ifdef CONFIG_MTD_UBI_DEBUG |
827 | mutex_init(&ubi->dbg_buf_mutex); | 828 | mutex_init(&ubi->dbg_buf_mutex); |
828 | ubi->dbg_peb_buf = vmalloc(ubi->peb_size); | 829 | ubi->dbg_peb_buf = vmalloc(ubi->peb_size); |
829 | if (!ubi->dbg_peb_buf) | 830 | if (!ubi->dbg_peb_buf) |
830 | goto out_free; | 831 | goto out_free; |
831 | #endif | 832 | #endif |
832 | 833 | ||
833 | err = attach_by_scanning(ubi); | 834 | err = attach_by_scanning(ubi); |