lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethernet: sun: Free the coherent when failing in probing

Browse Source 
[ Upstream commit bb77bd31c281f70ec77c9c4f584950a779e05cf8 ]

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zheyu Ma 2022-03-05 14:55:04 +00:00 committed by Greg Kroah-Hartman
parent aa3c3746e7
commit 96f9c386fe
1 changed files with 5 additions and 1 deletions

6
drivers/net/ethernet/sun/sunhme.c
View File

@ -3164,7 +3164,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
if (err) { if (err) {
printk(KERN_ERR "happymeal(PCI): Cannot register net device, " printk(KERN_ERR "happymeal(PCI): Cannot register net device, "
"aborting.\n"); "aborting.\n");
goto err_out_iounmap; goto err_out_free_coherent;
} }
pci_set_drvdata(pdev, hp); pci_set_drvdata(pdev, hp);
@ -3197,6 +3197,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
return 0; return 0;
err_out_free_coherent:
dma_free_coherent(hp->dma_dev, PAGE_SIZE,
hp->happy_block, hp->hblock_dvma);
err_out_iounmap: err_out_iounmap:
iounmap(hp->gregs); iounmap(hp->gregs);