diff options
| author | Mohamad Haj Yahia <mohamad@mellanox.com> | 2017-03-30 10:00:25 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-03 11:36:36 -0400 |
| commit | 03641c4ded853647933e13a7105edf071be95404 (patch) | |
| tree | fa3f96cd616444e0962251faa5c52c64a817be03 | |
| parent | b2440a5d3e259958a7775dba5d66eba4423fe6ce (diff) | |
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 <mohamad@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 7a196a07fa51..d776db79e325 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, | |||
| 966 | if (err) { | 966 | if (err) { |
| 967 | dev_err(&dev->pdev->dev, "Firmware over %d MS in initializing state, aborting\n", | 967 | dev_err(&dev->pdev->dev, "Firmware over %d MS in initializing state, aborting\n", |
| 968 | FW_INIT_TIMEOUT_MILI); | 968 | FW_INIT_TIMEOUT_MILI); |
| 969 | goto out_err; | 969 | goto err_cmd_cleanup; |
| 970 | } | 970 | } |
| 971 | 971 | ||
| 972 | err = mlx5_core_enable_hca(dev, 0); | 972 | err = mlx5_core_enable_hca(dev, 0); |