diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2024-10-25 18:46:08 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2024-11-14 23:51:47 +0300 |
| commit | be530c3fc296f35e67f0f799029ba17880dd3f50 (patch) | |
| tree | 8aaee1d6b1c6f09666696c47842e18e5a5b69fbc /drivers/clk | |
| parent | 198675bbc03d437fb80a35d781ad13d622d0ff68 (diff) | |
| download | linux-be530c3fc296f35e67f0f799029ba17880dd3f50.tar.xz | |
clk: mediatek: mt6735-apmixedsys: Fix an error handling path in clk_mt6735_apmixed_probe()
If an error occurs after a successful mtk_alloc_clk_data(),
mtk_free_clk_data() should be called, as already done in the .remove()
function.
Switch to mtk_devm_alloc_clk_data() in order to fix the memory leak in the
probe function, and simplify the remove function.
Fixes: 43c04ed79189 ("clk: mediatek: Add drivers for MediaTek MT6735 main clock and reset drivers")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/89ad840e7a484eaf4727470824acfe0fdc60fcef.1729871146.git.christophe.jaillet@wanadoo.fr
Tested-by: Yassine Oudjana <y.oudjana@protonmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/mediatek/clk-mt6735-apmixedsys.c b/drivers/clk/mediatek/clk-mt6735-apmixedsys.c index 104722a61dfd..e0949911e8f7 100644 --- a/drivers/clk/mediatek/clk-mt6735-apmixedsys.c +++ b/drivers/clk/mediatek/clk-mt6735-apmixedsys.c @@ -88,7 +88,7 @@ static int clk_mt6735_apmixed_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); - clk_data = mtk_alloc_clk_data(ARRAY_SIZE(apmixedsys_plls)); + clk_data = mtk_devm_alloc_clk_data(&pdev->dev, ARRAY_SIZE(apmixedsys_plls)); if (!clk_data) return -ENOMEM; platform_set_drvdata(pdev, clk_data); @@ -114,7 +114,6 @@ static void clk_mt6735_apmixed_remove(struct platform_device *pdev) struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev); mtk_clk_unregister_plls(apmixedsys_plls, ARRAY_SIZE(apmixedsys_plls), clk_data); - mtk_free_clk_data(clk_data); } static const struct of_device_id of_match_mt6735_apmixedsys[] = { |