Commit 4f7400d5 authored May 06, 2020 by Shay Drory Committed by Saeed Mahameed May 22, 2020

net/mlx5: Fix error flow in case of function_setup failure



Currently, if an error occurred during mlx5_function_setup(), we
keep dev->state as DEVICE_STATE_UP.
Fixing it by adding a goto label.

Fixes: e161105e ("net/mlx5: Function setup/teardown procedures")
Signed-off-by: Shay Drory <shayd@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

parent d37bd5e8

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1195,7 +1195,7 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot)

		err = mlx5_function_setup(dev, boot);
		if (err)
		goto out;
		goto err_function;

		if (boot) {
		err = mlx5_init_once(dev);
		@@ -1233,6 +1233,7 @@ err_load:
		mlx5_cleanup_once(dev);
		function_teardown:
		mlx5_function_teardown(dev, boot);
		err_function:
		dev->state = MLX5_DEVICE_STATE_INTERNAL_ERROR;
		mutex_unlock(&dev->intf_state_mutex);

Admin message