Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61b71c5f authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

ARM: imx: add missing clk_disable_unprepare() 



[ Upstream commit f07ec85365807b3939f32d0094a6dd5ce065d1b9 ]

clock source is prepared and enabled by clk_prepare_enable()
in probe function, but no disable or unprepare in remove and
error path.

Fixes: 9454a0ca ("ARM: imx: add mmdc ipg clock operation for mmdc")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d88d6bba

arch/arm/mach-imx/mmdc.c

+9 −3
Original line number Diff line number Diff line
@@ -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;

}