IB/mlx4: Fix device max capabilities check

Move the check on max supported CQEs after the final number of entries is
evaluated.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index d5e60f44ba5a..ea299515ecb2 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -365,7 +365,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
 
         mutex_lock(&cq->resize_mutex);
 
-        if (entries < 1 || entries > dev->dev->caps.max_cqes) {
+        if (entries < 1) {
                 err = -EINVAL;
                 goto out;
         }
@@ -376,6 +376,11 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                 goto out;
         }
 
+        if (entries > dev->dev->caps.max_cqes) {
+                err = -EINVAL;
+                goto out;
+        }
+
         if (ibcq->uobject) {
                 err = mlx4_alloc_resize_umem(dev, cq, entries, udata);
                 if (err)