[PATCH AUTOSEL for 4.9 150/293] net/mlx5: Fix driver load error flow when firmware is stuck

[Sasha Levin]

From: Gal Pressman 

[ Upstream commit 8ce59b16b4b6eacedaec1f7b652b4781cdbfe15f ]

When wait for firmware init fails, previous code would mistakenly
return success and cause inconsistency in the driver state.

Fixes: 6c780a0267b8 ("net/mlx5: Wait for FW readiness before initializing 
command interface")
Signed-off-by: Gal Pressman 
Signed-off-by: Saeed Mahameed 
Signed-off-by: Sasha Levin 
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c 
b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 981cd1d84a5b..9405bf9e5974 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -963,7 +963,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct 
mlx5_priv *priv,
if (err) {
dev_err(>pdev->dev, "Firmware over %d MS in 
pre-initializing state, aborting\n",
FW_PRE_INIT_TIMEOUT_MILI);
-   goto out;
+   goto out_err;
}
 
err = mlx5_cmd_init(dev);
-- 
2.15.1

[PATCH AUTOSEL for 4.9 150/293] net/mlx5: Fix driver load error flow when firmware is stuck

[Sasha Levin]

From: Gal Pressman 

[ Upstream commit 8ce59b16b4b6eacedaec1f7b652b4781cdbfe15f ]

When wait for firmware init fails, previous code would mistakenly
return success and cause inconsistency in the driver state.

Fixes: 6c780a0267b8 ("net/mlx5: Wait for FW readiness before initializing 
command interface")
Signed-off-by: Gal Pressman 
Signed-off-by: Saeed Mahameed 
Signed-off-by: Sasha Levin 
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c 
b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 981cd1d84a5b..9405bf9e5974 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -963,7 +963,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct 
mlx5_priv *priv,
if (err) {
dev_err(>pdev->dev, "Firmware over %d MS in 
pre-initializing state, aborting\n",
FW_PRE_INIT_TIMEOUT_MILI);
-   goto out;
+   goto out_err;
}
 
err = mlx5_cmd_init(dev);
-- 
2.15.1