Re: [PATCH 1/2 for 4.19.y] ARM: imx: add missing clk_disable_unprepare()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Sep 07, 2021 at 08:27:21AM +0900, Nobuhiro Iwamatsu wrote:
> From: Yang Yingliang <yangyingliang@xxxxxxxxxx>
> 
> commit f07ec85365807b3939f32d0094a6dd5ce065d1b9 upstream.
> 
> 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>
> Signed-off-by: Shawn Guo <shawnguo@xxxxxxxxxx>
> Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@xxxxxxxxxxxxx>
> ---
>  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 ae0a61c61a6e12..ba830be0b53102 100644
> --- a/arch/arm/mach-imx/mmdc.c
> +++ b/arch/arm/mach-imx/mmdc.c
> @@ -109,6 +109,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;
>  };
>  
>  /*
> @@ -474,11 +475,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;
> @@ -506,6 +509,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
> @@ -579,9 +583,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.33.0
> 
> 

Both now queued up, thanks.

greg k-h



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux