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

Commit 48e79555 authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Greg Kroah-Hartman
Browse files

net/mlx5: FWTrace, cancel work on alloc pd error flow 



commit dfe6fd72b5f1878b16aa2c8603e031bbcd66b96d upstream.

Handle error flow on mlx5_core_alloc_pd() failure,
read_fw_strings_work must be canceled.

Fixes: c71ad41c ("net/mlx5: FW tracer, events handling")
Reported-by: default avatarPavel Machek (CIP) <pavel@denx.de>
Suggested-by: default avatarPavel Machek (CIP) <pavel@denx.de>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarAya Levin <ayal@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4655f8a5

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

+2 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 
	err = mlx5_core_alloc_pd(dev, &tracer->buff.pdn);

	if (err) {

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

		return err;

		goto err_cancel_work;

	}



	err = mlx5_fw_tracer_create_mkey(tracer);
@@ -1029,6 +1029,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 
	mlx5_core_destroy_mkey(dev, &tracer->buff.mkey);

err_dealloc_pd:

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

err_cancel_work:

	cancel_work_sync(&tracer->read_fw_strings_work);

	return err;

}