1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index d5e60f44ba5a..66dbf8062374 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -324,7 +324,7 @@ static int mlx4_ib_get_outstanding_cqes(struct mlx4_ib_cq *cq)
         u32 i;
 
         i = cq->mcq.cons_index;
-        while (get_sw_cqe(cq, i & cq->ibcq.cqe))
+        while (get_sw_cqe(cq, i))
                 ++i;
 
         return i - cq->mcq.cons_index;
@@ -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)