summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-04-16 02:16:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-16 02:35:22 +0300
commit201c7b72f0bf38d7f31fd229a01de035d0f10cd1 (patch)
treebda27da290d049a0edd31daebd2e580d2d67c1df /drivers/block
parent160a117f0864871ae1bab26554a985a1d2861afd (diff)
downloadlinux-201c7b72f0bf38d7f31fd229a01de035d0f10cd1.tar.xz
zram: fix error return code
Return a negative error code on failure. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Minchan Kim <minchan@kernel.org> Cc: Nitin Gupta <ngupta@vflare.org> Acked-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/zram/zram_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 4491787095a0..c94386aa563d 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1154,6 +1154,7 @@ static int create_device(struct zram *zram, int device_id)
if (!zram->disk) {
pr_warn("Error allocating disk structure for device %d\n",
device_id);
+ ret = -ENOMEM;
goto out_free_queue;
}