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

Commit 20d38525 authored by Liu Jian's avatar Liu Jian Committed by Greg Kroah-Hartman
Browse files

mlxsw: destroy workqueue when trap_register in mlxsw_emad_init 



[ Upstream commit 5dbaeb87f2b309936be0aeae00cbc9e7f20ab296 ]

When mlxsw_core_trap_register fails in mlxsw_emad_init,
destroy_workqueue() shouled be called to destroy mlxsw_core->emad_wq.

Fixes: d965465b ("mlxsw: core: Fix possible deadlock")
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b54cf873

drivers/net/ethernet/mellanox/mlxsw/core.c

+2 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) 
	err = mlxsw_core_trap_register(mlxsw_core, &mlxsw_emad_rx_listener,

				       mlxsw_core);

	if (err)

		return err;

		goto err_trap_register;



	err = mlxsw_core->driver->basic_trap_groups_set(mlxsw_core);

	if (err)
@@ -599,6 +599,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) 
err_emad_trap_set:

	mlxsw_core_trap_unregister(mlxsw_core, &mlxsw_emad_rx_listener,

				   mlxsw_core);

err_trap_register:

	destroy_workqueue(mlxsw_core->emad_wq);

	return err;

}