diff options
| author | Mohamad Haj Yahia | 2017-03-30 16:00:25 +0200 |
|---|---|---|
| committer | Saeed Mahameed | 2017-04-22 20:52:37 +0200 |
| commit | 55378a238e04b39cc82957d91d16499704ea719b (patch) | |
| tree | 49c59c2aa32a2db7566c30da79999e0ff407e88a /drivers/net | |
| parent | Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | kernel-qcow2-linux-55378a238e04b39cc82957d91d16499704ea719b.tar.gz kernel-qcow2-linux-55378a238e04b39cc82957d91d16499704ea719b.tar.xz kernel-qcow2-linux-55378a238e04b39cc82957d91d16499704ea719b.zip | |
net/mlx5: Fix driver load bad flow when having fw initializing timeout
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>
Diffstat (limited to 'drivers/net')
| -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 60154a175bd3..0ad66324247f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1029,7 +1029,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; } err = mlx5_core_enable_hca(dev, 0); |