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

Commit 104eb270 authored by Hans de Goede's avatar Hans de Goede Committed by David S. Miller
Browse files

net: sun4i-emac: Properly free resources on probe failure and remove 



Fix sun4i-emac not releasing the following resources:
-iomapped memory not released on probe-failure nor on remove
-clock not getting disabled on probe-failure nor on remove
-sram not being released on remove

And while at it also add error checking to the clk_prepare_enable call
done on probe.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e754ec69

drivers/net/ethernet/allwinner/sun4i-emac.c

+16 −4
Original line number Diff line number Diff line
@@ -847,21 +847,25 @@ static int emac_probe(struct platform_device *pdev) 
	if (ndev->irq == -ENXIO) {

		netdev_err(ndev, "No irq resource\n");

		ret = ndev->irq;

		goto out;

		goto out_iounmap;

	}



	db->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(db->clk)) {

		ret = PTR_ERR(db->clk);

		goto out;

		goto out_iounmap;

	}



	clk_prepare_enable(db->clk);

	ret = clk_prepare_enable(db->clk);

	if (ret) {

		dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);

		goto out_iounmap;

	}



	ret = sunxi_sram_claim(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "Error couldn't map SRAM to device\n");

		goto out;

		goto out_clk_disable_unprepare;

	}



	db->phy_node = of_parse_phandle(np, "phy", 0);
@@ -910,6 +914,10 @@ static int emac_probe(struct platform_device *pdev) 


out_release_sram:

	sunxi_sram_release(&pdev->dev);

out_clk_disable_unprepare:

	clk_disable_unprepare(db->clk);

out_iounmap:

	iounmap(db->membase);

out:

	dev_err(db->dev, "not found (%d).\n", ret);
@@ -921,8 +929,12 @@ static int emac_probe(struct platform_device *pdev) 
static int emac_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct emac_board_info *db = netdev_priv(ndev);



	unregister_netdev(ndev);

	sunxi_sram_release(&pdev->dev);

	clk_disable_unprepare(db->clk);

	iounmap(db->membase);

	free_netdev(ndev);



	dev_dbg(&pdev->dev, "released and freed device\n");