Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christophe JAILLET and committed by
Stephen Boyd
be530c3f 198675bb

+1 -2
+1 -2
drivers/clk/mediatek/clk-mt6735-apmixedsys.c
··· 88 88 if (IS_ERR(base)) 89 89 return PTR_ERR(base); 90 90 91 - clk_data = mtk_alloc_clk_data(ARRAY_SIZE(apmixedsys_plls)); 91 + clk_data = mtk_devm_alloc_clk_data(&pdev->dev, ARRAY_SIZE(apmixedsys_plls)); 92 92 if (!clk_data) 93 93 return -ENOMEM; 94 94 platform_set_drvdata(pdev, clk_data); ··· 114 114 struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev); 115 115 116 116 mtk_clk_unregister_plls(apmixedsys_plls, ARRAY_SIZE(apmixedsys_plls), clk_data); 117 - mtk_free_clk_data(clk_data); 118 117 } 119 118 120 119 static const struct of_device_id of_match_mt6735_apmixedsys[] = {