Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 4186cc888ea..4c15e112736 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -325,16 +325,8 @@ EXPORT_SYMBOL(ib_destroy_cq);
 int ib_resize_cq(struct ib_cq *cq,
                  int           cqe)
 {
-        int ret;
-
-        if (!cq->device->resize_cq)
-                return -ENOSYS;
-
-        ret = cq->device->resize_cq(cq, &cqe);
-        if (!ret)
-                cq->cqe = cqe;
-
-        return ret;
+        return cq->device->resize_cq ?
+                cq->device->resize_cq(cq, cqe) : -ENOSYS;
 }
 EXPORT_SYMBOL(ib_resize_cq);