1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index ee1c577238f7..8afea12c8d44 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1084,12 +1084,9 @@ static void mlx4_ib_alloc_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
         int total_eqs = 0;
         int i, j, eq;
 
-        /* Init eq table */
-        ibdev->eq_table = NULL;
-        ibdev->eq_added = 0;
-
-        /* Legacy mode? */
-        if (dev->caps.comp_pool == 0)
+        /* Legacy mode or comp_pool is not large enough */
+        if (dev->caps.comp_pool == 0 ||
+            dev->caps.num_ports > dev->caps.comp_pool)
                 return;
 
         eq_per_port = rounddown_pow_of_two(dev->caps.comp_pool/
@@ -1135,7 +1132,10 @@ static void mlx4_ib_alloc_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
 static void mlx4_ib_free_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
 {
         int i;
-        int total_eqs;
+
+        /* no additional eqs were added */
+        if (!ibdev->eq_table)
+                return;
 
         /* Reset the advertised EQ number */
         ibdev->ib_dev.num_comp_vectors = dev->caps.num_comp_vectors;
@@ -1148,12 +1148,7 @@ static void mlx4_ib_free_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
                 mlx4_release_eq(dev, ibdev->eq_table[i]);
         }
 
-        total_eqs = dev->caps.num_comp_vectors + ibdev->eq_added;
-        memset(ibdev->eq_table, 0, total_eqs * sizeof(int));
         kfree(ibdev->eq_table);
-
-        ibdev->eq_table = NULL;
-        ibdev->eq_added = 0;
 }
 
 static void *mlx4_ib_add(struct mlx4_dev *dev)