Commit be530c3f authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Stephen Boyd
Browse files

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: 43c04ed7 ("clk: mediatek: Add drivers for MediaTek MT6735 main clock and reset drivers")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/89ad840e7a484eaf4727470824acfe0fdc60fcef.1729871146.git.christophe.jaillet@wanadoo.fr


Tested-by: default avatarYassine Oudjana <y.oudjana@protonmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 198675bb

drivers/clk/mediatek/clk-mt6735-apmixedsys.c

+1 −2
Original line number Diff line number Diff line
@@ -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[] = {