diff options
| author | Zheyu Ma <zheyuma97@gmail.com> | 2022-03-05 14:55:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-07 11:32:22 +0000 |
| commit | bb77bd31c281f70ec77c9c4f584950a779e05cf8 (patch) | |
| tree | 89e969bdb87896f5f2f67c0223ab378eee8a96cd | |
| parent | dd830aed23c6e07cd8e2a163742bf3d63c9add08 (diff) | |
| download | linux-bb77bd31c281f70ec77c9c4f584950a779e05cf8.tar.gz | |
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 <zheyuma97@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/sun/sunhme.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |