From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 2 Apr 2013 06:15:56 +0000 (+1030)
Subject: caif_virtio: fix error return code in cfv_create_genpool()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1aef76e9c4c616c91233ece9850e89c91f3fd92a;p=deliverable%2Flinux.git

caif_virtio: fix error return code in cfv_create_genpool()

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c
index 316b184ea130..0e3bede8b8a8 100644
--- a/drivers/net/caif/caif_virtio.c
+++ b/drivers/net/caif/caif_virtio.c
@@ -424,8 +424,10 @@ static int cfv_create_genpool(struct cfv_info *cfv)
 	cfv->reserved_size = num_possible_cpus() * cfv->ndev->mtu;
 	cfv->reserved_mem = gen_pool_alloc(cfv->genpool,
 					   cfv->reserved_size);
-	if (!cfv->reserved_mem)
+	if (!cfv->reserved_mem) {
+		err = -ENOMEM;
 		goto err;
+	}
 
 	cfv->watermark_tx = virtqueue_get_vring_size(cfv->vq_tx);
 	return 0;