From: Mohamad Haj Yahia Date: Thu, 30 Mar 2017 14:00:25 +0000 (+0300) Subject: net/mlx5: Fix driver load bad flow when having fw initializing timeout X-Git-Tag: v4.9.26~27 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=03641c4ded853647933e13a7105edf071be95404;p=users%2Fdwmw2%2Flinux.git net/mlx5: Fix driver load bad flow when having fw initializing timeout [ Upstream commit 55378a238e04b39cc82957d91d16499704ea719b ] If FW is stuck in initializing state we will skip the driver load, but current error handling flow doesn't clean previously allocated command interface resources. Fixes: e3297246c2c8 ('net/mlx5_core: Wait for FW readiness on startup') Signed-off-by: Mohamad Haj Yahia Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 7a196a07fa51d..d776db79e325e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -966,7 +966,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, if (err) { dev_err(&dev->pdev->dev, "Firmware over %d MS in initializing state, aborting\n", FW_INIT_TIMEOUT_MILI); - goto out_err; + goto err_cmd_cleanup; } err = mlx5_core_enable_hca(dev, 0);