clk: mediatek: mt6735-apmixedsys: Fix an error handling path in clk_mt6735_apmixed_pr...
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Fri, 25 Oct 2024 15:46:08 +0000 (17:46 +0200)
committerStephen Boyd <sboyd@kernel.org>
Thu, 14 Nov 2024 20:51:47 +0000 (12:51 -0800)
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>
drivers/clk/mediatek/clk-mt6735-apmixedsys.c

index 104722a..e094991 100644 (file)
@@ -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[] = {