diff mbox series

[v2] can: mcp251x: fix error handling code in mcp251x_can_probe

Message ID 20221024090256.717236-1-dzm91@hust.edu.cn
State New
Headers
Series [v2] can: mcp251x: fix error handling code in mcp251x_can_probe |

Commit Message

Dongliang Mu Oct. 24, 2022, 9:02 a.m. UTC 
  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: 2d52dabbef60 ("can: mcp251x: add GPIO support")
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
---
v1->v2: add fixes tag
 drivers/net/can/spi/mcp251x.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Marc Kleine-Budde Oct. 25, 2022, 7:15 a.m. UTC | #1 
On 24.10.2022 17:02:52, Dongliang Mu wrote:
> 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: 2d52dabbef60 ("can: mcp251x: add GPIO support")
> Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>

Applied to can/main.

Thanks,
Marc
diff mbox series

Patch

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index c320de474f40..00ed46683656 100644
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -1415,11 +1415,14 @@  static int mcp251x_can_probe(struct spi_device *spi)
 
 	ret = mcp251x_gpio_setup(priv);
 	if (ret)
-		goto error_probe;
+		goto err_reg_candev;
 
 	netdev_info(net, "MCP%x successfully initialized.\n", priv->model);
 	return 0;
 
+err_reg_candev:
+	unregister_candev(net);
+
 error_probe:
 	destroy_workqueue(priv->wq);
 	priv->wq = NULL;