summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@gnu.org>2011-03-23 00:34:49 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 01:44:15 +0100
commitea611b2699b51a762ef03f805f9616e65d98f68e (patch)
tree7c7303390dd4ddeffe2bf6cea3e4acd63f1fb4e4 /init
parentbinfmt_elf: quiet GCC-4.6 'set but not used' warning in load_elf_binary() (diff)
downloadlinux-ea611b2699b51a762ef03f805f9616e65d98f68e.tar.xz
linux-ea611b2699b51a762ef03f805f9616e65d98f68e.zip
init: return proper error code in do_mounts_rd()
In do_mounts_rd() if memory cannot be allocated, return -ENOMEM. Signed-off-by: Davidlohr Bueso <dave@gnu.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_rd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 6e1ee6987c78..fe9acb0ae480 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -64,7 +64,7 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
buf = kmalloc(size, GFP_KERNEL);
if (!buf)
- return -1;
+ return -ENOMEM;
minixsb = (struct minix_super_block *) buf;
ext2sb = (struct ext2_super_block *) buf;