clk: imx: clk-imx8mn: fix memory leak in imx8mn_clocks_probe
authorHao Luo <m202171776@hust.edu.cn>
Tue, 11 Apr 2023 01:51:07 +0000 (09:51 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Jul 2023 14:21:29 +0000 (16:21 +0200)
[ Upstream commit 188d070de9132667956f5aadd98d2bd87d3eac89 ]

Use devm_of_iomap() instead of of_iomap() to automatically handle
the unused ioremap region.

If any error occurs, regions allocated by kzalloc() will leak,
but using devm_kzalloc() instead will automatically free the memory
using devm_kfree().

Fixes: daeb14545514 ("clk: imx: imx8mn: Switch to clk_hw based API")
Fixes: 96d6392b54db ("clk: imx: Add support for i.MX8MN clock driver")
Signed-off-by: Hao Luo <m202171776@hust.edu.cn>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20230411015107.2645-1-m202171776@hust.edu.cn
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/imx/clk-imx8mn.c

index 2afea90..b2b8b8b 100644 (file)
@@ -323,7 +323,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
        void __iomem *base;
        int ret;
 
-       clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
+       clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
                                          IMX8MN_CLK_END), GFP_KERNEL);
        if (WARN_ON(!clk_hw_data))
                return -ENOMEM;
@@ -340,10 +340,10 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
        hws[IMX8MN_CLK_EXT4] = imx_obtain_fixed_clk_hw(np, "clk_ext4");
 
        np = of_find_compatible_node(NULL, NULL, "fsl,imx8mn-anatop");
-       base = of_iomap(np, 0);
+       base = devm_of_iomap(dev, np, 0, NULL);
        of_node_put(np);
-       if (WARN_ON(!base)) {
-               ret = -ENOMEM;
+       if (WARN_ON(IS_ERR(base))) {
+               ret = PTR_ERR(base);
                goto unregister_hws;
        }