Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / mellanox / mlx4 / cmd.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index fdc5f23d8e9f26ae9a0fe30638a4359cb22eafa3..05267d716e8687883eaedff07b875bec57181e33 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1837,10 +1837,8 @@ int mlx4_cmd_init(struct mlx4_dev *dev)
                priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE,
                                                      &priv->mfunc.vhcr_dma,
                                                      GFP_KERNEL);
-               if (!priv->mfunc.vhcr) {
-                       mlx4_err(dev, "Couldn't allocate VHCR.\n");
+               if (!priv->mfunc.vhcr)
                        goto err_hcr;
-               }
        }
 
        priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev,