2022-10-24 06:16:33

by Dongliang Mu

Subject: [PATCH] can: mcp251x: fix error handling code in mcp251x_can_probe

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 <[email protected]>
---
drivers/net/can/spi/mcp251x.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

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;
--
2.35.1

2022-10-24 09:03:44

by Dongliang Mu

Subject: Re: [PATCH] can: mcp251x: fix error handling code in mcp251x_can_probe

On Mon, Oct 24, 2022 at 4:16 PM Andy Shevchenko
<[email protected]> 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
>
>

2022-10-24 09:14:05

by Andy Shevchenko

Subject: Re: [PATCH] can: mcp251x: fix error handling code in mcp251x_can_probe

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?

--
With Best Regards,
Andy Shevchenko