summaryrefslogtreecommitdiff
path: root/drivers/net/caif
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-02 16:45:56 +1030
committerRusty Russell <rusty@rustcorp.com.au>2013-04-02 16:48:25 +1030
commit1aef76e9c4c616c91233ece9850e89c91f3fd92a (patch)
tree5ea2b9d27e0b419287e1ba8965744fd884edf5f9 /drivers/net/caif
parent916cdabc31cc245f4ae81d8113e24446225874c8 (diff)
downloadlinux-stable-1aef76e9c4c616c91233ece9850e89c91f3fd92a.tar.gz
linux-stable-1aef76e9c4c616c91233ece9850e89c91f3fd92a.tar.bz2
linux-stable-1aef76e9c4c616c91233ece9850e89c91f3fd92a.zip
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>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r--drivers/net/caif/caif_virtio.c4
1 files changed, 3 insertions, 1 deletions
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;