RE: [PATCH -next v2 2/2] ARM: imx: add missing clk_disable_unprepare()

[Aisheng Dong]

> From: Yang Yingliang <yangyingliang@xxxxxxxxxx>
> Sent: Tuesday, June 15, 2021 8:53 PM
> 
> clock source is prepared and enabled by clk_prepare_enable() in probe
> function, but no disable or unprepare in remove and error path.
> 
> Fixes: 9454a0caff6a ("ARM: imx: add mmdc ipg clock operation for mmdc")
> Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
> Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>

Reviewed-by: Dong Aisheng <aisheng.dong@xxxxxxx>

Regards
Aisheng

> ---
>  arch/arm/mach-imx/mmdc.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c index
> 8e57691aafe2..4a6f1359e1e9 100644
> --- a/arch/arm/mach-imx/mmdc.c
> +++ b/arch/arm/mach-imx/mmdc.c
> @@ -103,6 +103,7 @@ struct mmdc_pmu {
>  	struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];
>  	struct hlist_node node;
>  	struct fsl_mmdc_devtype_data *devtype_data;
> +	struct clk *mmdc_ipg_clk;
>  };
> 
>  /*
> @@ -463,11 +464,13 @@ static int imx_mmdc_remove(struct
> platform_device *pdev)
>  	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state,
> &pmu_mmdc->node);
>  	perf_pmu_unregister(&pmu_mmdc->pmu);
>  	iounmap(pmu_mmdc->mmdc_base);
> +	clk_disable_unprepare(pmu_mmdc->mmdc_ipg_clk);
>  	kfree(pmu_mmdc);
>  	return 0;
>  }
> 
> -static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem
> *mmdc_base)
> +static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem
> *mmdc_base,
> +			      struct clk *mmdc_ipg_clk)
>  {
>  	struct mmdc_pmu *pmu_mmdc;
>  	char *name;
> @@ -495,6 +498,7 @@ static int imx_mmdc_perf_init(struct platform_device
> *pdev, void __iomem *mmdc_b
>  	}
> 
>  	mmdc_num = mmdc_pmu_init(pmu_mmdc, mmdc_base, &pdev->dev);
> +	pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
>  	if (mmdc_num == 0)
>  		name = "mmdc";
>  	else
> @@ -568,9 +572,11 @@ static int imx_mmdc_probe(struct platform_device
> *pdev)
>  	val &= ~(1 << BP_MMDC_MAPSR_PSD);
>  	writel_relaxed(val, reg);
> 
> -	err = imx_mmdc_perf_init(pdev, mmdc_base);
> -	if (err)
> +	err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);
> +	if (err) {
>  		iounmap(mmdc_base);
> +		clk_disable_unprepare(mmdc_ipg_clk);
> +	}
> 
>  	return err;
>  }
> --
> 2.25.1