Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ce59b16 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5: Fix driver load error flow when firmware is stuck 



When wait for firmware init fails, previous code would mistakenly
return success and cause inconsistency in the driver state.

Fixes: 6c780a02 ("net/mlx5: Wait for FW readiness before initializing command interface")
Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent d747a7a5

drivers/net/ethernet/mellanox/mlx5/core/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1020,7 +1020,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
	if (err) {

	if (err) {

		dev_err(&dev->pdev->dev, "Firmware over %d MS in pre-initializing state, aborting\n",

		dev_err(&dev->pdev->dev, "Firmware over %d MS in pre-initializing state, aborting\n",

			FW_PRE_INIT_TIMEOUT_MILI);

			FW_PRE_INIT_TIMEOUT_MILI);

		goto out;

		goto out_err;

	}

	}





	err = mlx5_cmd_init(dev);

	err = mlx5_cmd_init(dev);