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

Commit e114f15d authored by Aya Levin's avatar Aya Levin Committed by Greg Kroah-Hartman
Browse files

net/mlx5: Fix return value from tracer initialization 



[ Upstream commit bd37c2888ccaa5ceb9895718f6909b247cc372e0 ]

Check return value of mlx5_fw_tracer_start(), set error path and fix
return value of mlx5_fw_tracer_init() accordingly.

Fixes: c71ad41c ("net/mlx5: FW tracer, events handling")
Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f99aa76b

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+9 −2
Original line number Diff line number Diff line
@@ -1017,12 +1017,19 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 
	MLX5_NB_INIT(&tracer->nb, fw_tracer_event, DEVICE_TRACER);

	mlx5_eq_notifier_register(dev, &tracer->nb);



	mlx5_fw_tracer_start(tracer);



	err = mlx5_fw_tracer_start(tracer);

	if (err) {

		mlx5_core_warn(dev, "FWTracer: Failed to start tracer %d\n", err);

		goto err_notifier_unregister;

	}

	return 0;



err_notifier_unregister:

	mlx5_eq_notifier_unregister(dev, &tracer->nb);

	mlx5_core_destroy_mkey(dev, &tracer->buff.mkey);

err_dealloc_pd:

	mlx5_core_dealloc_pd(dev, tracer->buff.pdn);

	cancel_work_sync(&tracer->read_fw_strings_work);

	return err;

}