UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

'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: 492205050d ("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>
This commit is contained in:
Christophe JAILLET 2020-12-14 21:21:17 +01:00 committed by Jakub Kicinski
parent efb796f557
commit 322e53d1e2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/allwinner/sun4i-emac.c
View File

@ -828,13 +828,13 @@ static int emac_probe(struct platform_device *pdev)
db->clk = devm_clk_get(&pdev->dev, NULL); db->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(db->clk)) { if (IS_ERR(db->clk)) {
ret = PTR_ERR(db->clk); ret = PTR_ERR(db->clk);
goto out_iounmap; goto out_dispose_mapping;
} }
ret = clk_prepare_enable(db->clk); ret = clk_prepare_enable(db->clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", 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); ret = sunxi_sram_claim(&pdev->dev);
@ -893,6 +893,8 @@ out_release_sram:
sunxi_sram_release(&pdev->dev); sunxi_sram_release(&pdev->dev);
out_clk_disable_unprepare: out_clk_disable_unprepare:
clk_disable_unprepare(db->clk); clk_disable_unprepare(db->clk);
out_dispose_mapping:
irq_dispose_mapping(ndev->irq);
out_iounmap: out_iounmap:
iounmap(db->membase); iounmap(db->membase);
out: out:
@ -911,6 +913,7 @@ static int emac_remove(struct platform_device *pdev)
unregister_netdev(ndev); unregister_netdev(ndev);
sunxi_sram_release(&pdev->dev); sunxi_sram_release(&pdev->dev);
clk_disable_unprepare(db->clk); clk_disable_unprepare(db->clk);
irq_dispose_mapping(ndev->irq);
iounmap(db->membase); iounmap(db->membase);
free_netdev(ndev); free_netdev(ndev);