2022-03-05 16:25:45

by Zheyu Ma

Subject: [PATCH] ethernet: sun: Free the coherent when failing in probing

When the driver fails to register net device, it should free the DMA
region first, and then do other cleanup.

Signed-off-by: Zheyu Ma <[email protected]>
---
drivers/net/ethernet/sun/sunhme.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index ad9029ae6848..77e5dffb558f 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -3146,7 +3146,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
if (err) {
printk(KERN_ERR "happymeal(PCI): Cannot register net device, "
"aborting.\n");
- goto err_out_iounmap;
+ goto err_out_free_coherent;
}

pci_set_drvdata(pdev, hp);
@@ -3179,6 +3179,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,

return 0;

+err_out_free_coherent:
+ dma_free_coherent(hp->dma_dev, PAGE_SIZE,
+ hp->happy_block, hp->hblock_dvma);
+
err_out_iounmap:
iounmap(hp->gregs);

--
2.25.1

2022-03-05 20:16:04

by Andrew Lunn

Subject: Re: [PATCH] ethernet: sun: Free the coherent when failing in probing

On Sat, Mar 05, 2022 at 02:55:04PM +0000, Zheyu Ma wrote:
> When the driver fails to register net device, it should free the DMA
> region first, and then do other cleanup.
>
> Signed-off-by: Zheyu Ma <[email protected]>

Reviewed-by: Andrew Lunn <[email protected]>

Andrew

2022-03-07 18:37:58

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] ethernet: sun: Free the coherent when failing in probing

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Sat, 5 Mar 2022 14:55:04 +0000 you wrote:
> When the driver fails to register net device, it should free the DMA
> region first, and then do other cleanup.
>
> Signed-off-by: Zheyu Ma <[email protected]>
> ---
> drivers/net/ethernet/sun/sunhme.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)

Here is the summary with links:
- ethernet: sun: Free the coherent when failing in probing
https://git.kernel.org/netdev/net/c/bb77bd31c281

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