ethernet: sun: Free the coherent when failing in probing
[ Upstream commit bb77bd31c2
]
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:
Родитель
afffb79a2d
Коммит
cd3121310e
|
@ -3139,7 +3139,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);
|
||||
|
@ -3172,6 +3172,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);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче