Commit bb77bd31 authored by Zheyu Ma's avatar Zheyu Ma Committed by David S. Miller

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: default avatarZheyu Ma <zheyuma97@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd830aed
...@@ -3146,7 +3146,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, ...@@ -3146,7 +3146,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);
...@@ -3179,6 +3179,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, ...@@ -3179,6 +3179,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment