summaryrefslogtreecommitdiff
path: root/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2015-07-30 14:59:33 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2015-07-30 14:59:33 +0100
commitcb3a3d0b24fdb9706b44b38350549004c877d038 (patch)
tree67db08e4cf41c3fa2ef3aa0dd5a0965dd3a0c27b /drivers/infiniband/ulp/ipoib/ipoib_verbs.c
parent54512793a26cd1a472bc7c31242efc0565e5cac9 (diff)
parent33fd710fe8404ad847e0cbbbd465194fcdf5e146 (diff)
Merge remote-tracking branch 'leif/arm64-pcihost-generic' into leg-kernelleg-mainline-20150730.0
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_verbs.c')
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_verbs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 9e6ee82a8fd7..851c8219d501 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -177,7 +177,8 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
else
size += ipoib_recvq_size * ipoib_max_conn_qp;
} else
- goto out_free_wq;
+ if (ret != -ENOSYS)
+ goto out_free_wq;
cq_attr.cqe = size;
priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL,