Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c412716b authored by Zheyu Ma's avatar Zheyu Ma Committed by Greg Kroah-Hartman
Browse files

ethernet: sun: Free the coherent when failing in probing 



[ 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: default avatarZheyu Ma <zheyuma97@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 916cf60f

drivers/net/ethernet/sun/sunhme.c

+5 −1
Original line number Diff line number Diff line
@@ -3164,7 +3164,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);
@@ -3197,6 +3197,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);