1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index f91719a08cba..b3ee9bafff5e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -480,9 +480,6 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
                 goto err_table;
         }
         mpt_entry = mailbox->buf;
-
-        memset(mpt_entry, 0, sizeof *mpt_entry);
-
         mpt_entry->flags = cpu_to_be32(MLX4_MPT_FLAG_MIO         |
                                        MLX4_MPT_FLAG_REGION      |
                                        mr->access);
@@ -695,8 +692,6 @@ int mlx4_mw_enable(struct mlx4_dev *dev, struct mlx4_mw *mw)
         }
         mpt_entry = mailbox->buf;
 
-        memset(mpt_entry, 0, sizeof(*mpt_entry));
-
         /* Note that the MLX4_MPT_FLAG_REGION bit in mpt_entry->flags is turned
          * off, thus creating a memory window and not a memory region.
          */
@@ -755,14 +750,14 @@ int mlx4_init_mr_table(struct mlx4_dev *dev)
         struct mlx4_mr_table *mr_table = &priv->mr_table;
         int err;
 
-        if (!is_power_of_2(dev->caps.num_mpts))
-                return -EINVAL;
-
         /* Nothing to do for slaves - all MR handling is forwarded
         * to the master */
         if (mlx4_is_slave(dev))
                 return 0;
 
+        if (!is_power_of_2(dev->caps.num_mpts))
+                return -EINVAL;
+
         err = mlx4_bitmap_init(&mr_table->mpt_bitmap, dev->caps.num_mpts,
                                ~0, dev->caps.reserved_mrws, 0);
         if (err)