[PATCH net 0/n] pull-request: can 2022-10-25

[PATCH net 0/n] pull-request: can 2022-10-25

[Marc Kleine-Budde]

Hello Jakub, hello David,

this is a pull request of 2 patches for net/master.

Both patches are by Dongliang Mu.

The 1st patch adds a missing cleanup call in the error path of the
probe function in mpc5xxx glue code for the mscan driver.

The 2nd patch adds a missing cleanup call in the error path of the
probe function of the mcp251x driver.

regards,
Marc

---

The following changes since commit baee5a14ab2c9a8f8df09d021885c8f5de458a38:

  Merge tag 'ieee802154-for-net-2022-10-24' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan (2022-10-24 21:17:03 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-6.1-20221025

for you to fetch changes up to b1a09b63684cea56774786ca14c13b7041ffee63:

  can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path (2022-10-25 09:13:14 +0200)

----------------------------------------------------------------
linux-can-fixes-for-6.1-20221025

----------------------------------------------------------------
Dongliang Mu (2):
      can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
      can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path

 drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++---
 drivers/net/can/spi/mcp251x.c       | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

[PATCH net 1/2] can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path

[Marc Kleine-Budde]

From: Dongliang Mu <dzm91@hust.edu.cn>

The commit 1149108e2fbf ("can: mscan: improve clock API use") only
adds put_clock() in mpc5xxx_can_remove() function, forgetting to add
put_clock() in the error handling code.

Fix this bug by adding put_clock() in the error handling code.

Fixes: 1149108e2fbf ("can: mscan: improve clock API use")
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
Link: https://lore.kernel.org/all/20221024133828.35881-1-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/mscan/mpc5xxx_can.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index c469b2f3e57d..b0ed798ae70f 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -322,14 +322,14 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)
 					       &mscan_clksrc);
 	if (!priv->can.clock.freq) {
 		dev_err(&ofdev->dev, "couldn't get MSCAN clock properties\n");
-		goto exit_free_mscan;
+		goto exit_put_clock;
 	}
 
 	err = register_mscandev(dev, mscan_clksrc);
 	if (err) {
 		dev_err(&ofdev->dev, "registering %s failed (err=%d)\n",
 			DRV_NAME, err);
-		goto exit_free_mscan;
+		goto exit_put_clock;
 	}
 
 	dev_info(&ofdev->dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n",
@@ -337,7 +337,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)
 
 	return 0;
 
-exit_free_mscan:
+exit_put_clock:
+	if (data->put_clock)
+		data->put_clock(ofdev);
 	free_candev(dev);
 exit_dispose_irq:
 	irq_dispose_mapping(irq);

base-commit: baee5a14ab2c9a8f8df09d021885c8f5de458a38
-- 
2.35.1

[PATCH net 2/2] can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path

[Marc Kleine-Budde]

From: Dongliang Mu <dzm91@hust.edu.cn>

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>
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>
---
 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..24883a65ca66 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 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;
-- 
2.35.1

Re: [PATCH net 0/n] pull-request: can 2022-10-25

[patchwork-bot+netdevbpf]

Hello:

This pull request was applied to netdev/net.git (master)
by Marc Kleine-Budde <mkl@pengutronix.de>:

On Wed, 26 Oct 2022 09:55:18 +0200 you wrote:
> Hello Jakub, hello David,
> 
> this is a pull request of 2 patches for net/master.
> 
> Both patches are by Dongliang Mu.
> 
> The 1st patch adds a missing cleanup call in the error path of the
> probe function in mpc5xxx glue code for the mscan driver.
> 
> [...]

Here is the summary with links:
  - [net,0/n] pull-request: can 2022-10-25
    https://git.kernel.org/netdev/net/c/8b9d377afaed
  - [net,2/2] can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path
    https://git.kernel.org/netdev/net/c/b1a09b63684c

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH net 1/2] can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by Marc Kleine-Budde <mkl@pengutronix.de>:

On Wed, 26 Oct 2022 09:55:19 +0200 you wrote:
> From: Dongliang Mu <dzm91@hust.edu.cn>
> 
> The commit 1149108e2fbf ("can: mscan: improve clock API use") only
> adds put_clock() in mpc5xxx_can_remove() function, forgetting to add
> put_clock() in the error handling code.
> 
> Fix this bug by adding put_clock() in the error handling code.
> 
> [...]

Here is the summary with links:
  - [net,1/2] can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
    https://git.kernel.org/netdev/net/c/3e5b3418827c

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html