| From foo@baz Sat Apr 29 08:22:13 CEST 2017 |
| From: Mohamad Haj Yahia <mohamad@mellanox.com> |
| Date: Thu, 30 Mar 2017 17:00:25 +0300 |
| Subject: net/mlx5: Fix driver load bad flow when having fw initializing timeout |
| |
| From: Mohamad Haj Yahia <mohamad@mellanox.com> |
| |
| |
| [ 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 <mohamad@mellanox.com> |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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_cor |
| 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); |
