On 25/10/2024 6:46 pm, Christophe JAILLET wrote:
> 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@xxxxxxxxxx>
> ---
> Compile tested only
> ---
> drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 3 +--
> 1 file changed, 1 insertion(+), 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[] = {
> --
> 2.47.0
>
Thanks for the fix!
Tested-by: Yassine Oudjana <y.oudjana@xxxxxxxxxxxxxx>
