Message ID | 1646492104-23040-1-git-send-email-zheyuma97@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | bb77bd31c281f70ec77c9c4f584950a779e05cf8 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | ethernet: sun: Free the coherent when failing in probing | expand |
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 <zheyuma97@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: 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 <zheyuma97@gmail.com> > --- > 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!
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);
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 <zheyuma97@gmail.com> --- drivers/net/ethernet/sun/sunhme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)