| From 08f5ee36c33f5d3377b0e63581ae4967553ee28f Mon Sep 17 00:00:00 2001 |
| From: Mohamad Haj Yahia <mohamad@mellanox.com> |
| Date: Thu, 30 Mar 2017 17:00:25 +0300 |
| Subject: [PATCH] net/mlx5: Fix driver load bad flow when having fw |
| initializing timeout |
| |
| commit 55378a238e04b39cc82957d91d16499704ea719b upstream. |
| |
| 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> |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| index 3bdc8ffca99c..c755896bb170 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c |
| @@ -1032,7 +1032,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; |
| } |
| |
| mlx5_pagealloc_init(dev); |
| -- |
| 2.12.0 |
| |
