net: allwinner: Fix some resources leak in the error handling path of the probe and...

[ Upstream commit 322e53d1e2529ae9d501f5e0f20604a79b873aef ]

'irq_of_parse_and_map()' should be balanced by a corresponding
'irq_dispose_mapping()' call. Otherwise, there is some resources leaks.

Add such a call in the error handling path of the probe function and in the
remove function.

Fixes: 492205050d77 ("net: Add EMAC ethernet driver found on Allwinner A10 SoC's")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20201214202117.146293-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index c458b81ba63affc70af5aaa01a07afd895c4d2c8..d249a4309da2fc951bc3130a8ae3b45479390e4c 100644 (file)
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -847,13 +847,13 @@ static int emac_probe(struct platform_device *pdev)
        db->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(db->clk)) {
                ret = PTR_ERR(db->clk);
-               goto out_iounmap;
+               goto out_dispose_mapping;
        }
 
        ret = clk_prepare_enable(db->clk);
        if (ret) {
                dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);
-               goto out_iounmap;
+               goto out_dispose_mapping;
        }
 
        ret = sunxi_sram_claim(&pdev->dev);
@@ -910,6 +910,8 @@ out_release_sram:
        sunxi_sram_release(&pdev->dev);
 out_clk_disable_unprepare:
        clk_disable_unprepare(db->clk);
+out_dispose_mapping:
+       irq_dispose_mapping(ndev->irq);
 out_iounmap:
        iounmap(db->membase);
 out:
@@ -928,6 +930,7 @@ static int emac_remove(struct platform_device *pdev)
        unregister_netdev(ndev);
        sunxi_sram_release(&pdev->dev);
        clk_disable_unprepare(db->clk);
+       irq_dispose_mapping(ndev->irq);
        iounmap(db->membase);
        free_netdev(ndev);