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

Gal Pressman · Saeed Mahameed · commit 8ce59b16b4b6 · 2017-06-27T14:49:57.000+03:00
When wait for firmware init fails, previous code would mistakenly return success and cause inconsistency in the driver state. Fixes: 6c780a0 ("net/mlx5: Wait for FW readiness before initializing command interface") Signed-off-by: Gal Pressman <galp@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
@@ -1020,7 +1020,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 pre-initializing state, aborting\n",
 			FW_PRE_INIT_TIMEOUT_MILI);
-		goto out;
+		goto out_err;
 	}
 
 	err = mlx5_cmd_init(dev);

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ static int mlx5_load_one(struct mlx5_core_dev dev, struct mlx5_priv priv,`
`1020`	`1020`	`if (err) {`
`1021`	`1021`	`dev_err(&dev->pdev->dev, "Firmware over %d MS in pre-initializing state, aborting\n",`
`1022`	`1022`	`FW_PRE_INIT_TIMEOUT_MILI);`
`1023`		`- goto out;`
	`1023`	`+ goto out_err;`
`1024`	`1024`	`}`
`1025`	`1025`
`1026`	`1026`	`err = mlx5_cmd_init(dev);`