On 22-10-28 17:52:06, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@xxxxxxx>
>
> The anatop base is not unmapped during error handling path, fix it.
>
> Fixes: 24defbe194b6 ("clk: imx: add i.MX93 clk")
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
Reviewed-by: Abel Vesa <abel.vesa@xxxxxxxxxx>
> ---
> drivers/clk/imx/clk-imx93.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/imx/clk-imx93.c b/drivers/clk/imx/clk-imx93.c
> index 99cff1fd108b..9ef3fcbdd951 100644
> --- a/drivers/clk/imx/clk-imx93.c
> +++ b/drivers/clk/imx/clk-imx93.c
> @@ -258,7 +258,7 @@ static int imx93_clocks_probe(struct platform_device *pdev)
> struct device_node *np = dev->of_node;
> const struct imx93_clk_root *root;
> const struct imx93_clk_ccgr *ccgr;
> - void __iomem *base = NULL;
> + void __iomem *base, *anatop_base;
> int i, ret;
>
> clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
> @@ -285,20 +285,22 @@ static int imx93_clocks_probe(struct platform_device *pdev)
> "sys_pll_pfd2", 1, 2);
>
> np = of_find_compatible_node(NULL, NULL, "fsl,imx93-anatop");
> - base = of_iomap(np, 0);
> + anatop_base = of_iomap(np, 0);
> of_node_put(np);
> - if (WARN_ON(!base))
> + if (WARN_ON(!anatop_base))
> return -ENOMEM;
>
> - clks[IMX93_CLK_AUDIO_PLL] = imx_clk_fracn_gppll("audio_pll", "osc_24m", base + 0x1200,
> + clks[IMX93_CLK_AUDIO_PLL] = imx_clk_fracn_gppll("audio_pll", "osc_24m", anatop_base + 0x1200,
> &imx_fracn_gppll);
> - clks[IMX93_CLK_VIDEO_PLL] = imx_clk_fracn_gppll("video_pll", "osc_24m", base + 0x1400,
> + clks[IMX93_CLK_VIDEO_PLL] = imx_clk_fracn_gppll("video_pll", "osc_24m", anatop_base + 0x1400,
> &imx_fracn_gppll);
>
> np = dev->of_node;
> base = devm_platform_ioremap_resource(pdev, 0);
> - if (WARN_ON(IS_ERR(base)))
> + if (WARN_ON(IS_ERR(base))) {
> + iounmap(anatop_base);
> return PTR_ERR(base);
> + }
>
> for (i = 0; i < ARRAY_SIZE(root_array); i++) {
> root = &root_array[i];
> @@ -327,6 +329,7 @@ static int imx93_clocks_probe(struct platform_device *pdev)
>
> unregister_hws:
> imx_unregister_hw_clocks(clks, IMX93_CLK_END);
> + iounmap(anatop_base);
>
> return ret;
> }
> --
> 2.37.1
>
