lkml.org 
[lkml]   [2022]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/6] clk: imx93: unmap anatop base in error handling path
    Date
    From: Peng Fan <peng.fan@nxp.com>

    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@oracle.com>
    Signed-off-by: Peng Fan <peng.fan@nxp.com>
    ---
    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
    \
     
     \ /
      Last update: 2022-10-28 11:53    [W:4.060 / U:0.948 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site