Commit e02ba11b authored by Zhanhao Hu's avatar Zhanhao Hu Committed by Abel Vesa
Browse files

clk: imx93: fix memory leak and missing unwind goto in imx93_clocks_probe 



In function probe(), it returns directly without unregistered hws
when error occurs.

Fix this by adding 'goto unregister_hws;' on line 295 and
line 310.

Use devm_kzalloc() instead of kzalloc() to automatically
free the memory using devm_kfree() when error occurs.

Replace of_iomap() with devm_of_iomap() to automatically
handle the unused ioremap region and delete 'iounmap(anatop_base);'
in unregister_hws.

Fixes: 24defbe1 ("clk: imx: add i.MX93 clk")
Signed-off-by: default avatarZhanhao Hu <zero12113@hust.edu.cn>
Reviewed-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20230601033825.336558-1-zero12113@hust.edu.cn


Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
parent 188d070d

drivers/clk/imx/clk-imx93.c

+8 −7
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int imx93_clocks_probe(struct platform_device *pdev) 
	void __iomem *base, *anatop_base;

	int i, ret;



	clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,

	clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,

					  IMX93_CLK_END), GFP_KERNEL);

	if (!clk_hw_data)

		return -ENOMEM;
@@ -288,10 +288,12 @@ static int imx93_clocks_probe(struct platform_device *pdev) 
								    "sys_pll_pfd2", 1, 2);



	np = of_find_compatible_node(NULL, NULL, "fsl,imx93-anatop");

	anatop_base = of_iomap(np, 0);

	anatop_base = devm_of_iomap(dev, np, 0, NULL);

	of_node_put(np);

	if (WARN_ON(!anatop_base))

		return -ENOMEM;

	if (WARN_ON(IS_ERR(anatop_base))) {

		ret = PTR_ERR(base);

		goto unregister_hws;

	}



	clks[IMX93_CLK_ARM_PLL] = imx_clk_fracn_gppll_integer("arm_pll", "osc_24m",

							      anatop_base + 0x1000,
@@ -304,8 +306,8 @@ static int imx93_clocks_probe(struct platform_device *pdev) 
	np = dev->of_node;

	base = devm_platform_ioremap_resource(pdev, 0);

	if (WARN_ON(IS_ERR(base))) {

		iounmap(anatop_base);

		return PTR_ERR(base);

		ret = PTR_ERR(base);

		goto unregister_hws;

	}



	for (i = 0; i < ARRAY_SIZE(root_array); i++) {
@@ -345,7 +347,6 @@ static int imx93_clocks_probe(struct platform_device *pdev) 


unregister_hws:

	imx_unregister_hw_clocks(clks, IMX93_CLK_END);

	iounmap(anatop_base);



	return ret;

}