| From c378e6f55b462eea331bceae5e996e5e386babc4 Mon Sep 17 00:00:00 2001 |
| From: Gal Pressman <galp@mellanox.com> |
| Date: Mon, 19 Jun 2017 18:25:59 +0300 |
| Subject: net/mlx5: Fix driver load error flow when firmware is stuck |
| |
| [ 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 <galp@mellanox.com> |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 6698a3a07406..d676088512cf 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| @@ -957,7 +957,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 pre-initializing state, aborting\n", |
| FW_PRE_INIT_TIMEOUT_MILI); |
| - goto out; |
| + goto out_err; |
| } |
| |
| err = mlx5_cmd_init(dev); |
| -- |
| 2.17.1 |
| |
