diff mbox series

can: mcp251x: fix error handling code in mcp251x_can_probe

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

Commit Message

Dongliang Mu Oct. 24, 2022, 5:37 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.

Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
---
 drivers/net/can/spi/mcp251x.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Andy Shevchenko Oct. 24, 2022, 8:10 a.m. UTC | #1 
On Mon, Oct 24, 2022 at 01:37:07PM +0800, 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 tag?
Dongliang Mu Oct. 24, 2022, 8:43 a.m. UTC | #2 
On Mon, Oct 24, 2022 at 4:16 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> On Mon, Oct 24, 2022 at 01:37:07PM +0800, 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 tag?

Fixes: 2d52dabbef60 ("can: mcp251x: add GPIO support")

This commit adds the mcp251x_gpio_setup function, but with an incorrect label.

>
> --
> With Best Regards,
> Andy Shevchenko
>
>
diff mbox series

Patch

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index c320de474f40..b4b280c0699d 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;