Skip to content

Commit

Permalink
can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in…
Browse files Browse the repository at this point in the history
… error path

[ Upstream commit b1a09b6 ]

In mcp251x_can_probe(), if mcp251x_gpio_setup() fails, it forgets to
unregister the CAN device.

Fix this by unregistering can device in mcp251x_can_probe().

Fixes: 2d52dab ("can: mcp251x: add GPIO support")
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
Link: https://lore.kernel.org/all/20221024090256.717236-1-dzm91@hust.edu.cn
[mkl: adjust label]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
mudongliang authored and gregkh committed Nov 3, 2022
1 parent a3e09ef commit 3cc8c40
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/net/can/spi/mcp251x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1419,11 +1419,14 @@ static int mcp251x_can_probe(struct spi_device *spi)

ret = mcp251x_gpio_setup(priv);
if (ret)
goto error_probe;
goto out_unregister_candev;

netdev_info(net, "MCP%x successfully initialized.\n", priv->model);
return 0;

out_unregister_candev:
unregister_candev(net);

error_probe:
destroy_workqueue(priv->wq);
priv->wq = NULL;
Expand Down

0 comments on commit 3cc8c40

Please sign in to comment.