Thread (3 messages) flat view 3 messages, 2 authors, 2021-05-24

Re: [PATCH -next] ARM: imx: add missing clk_disable_unprepare() in imx_mmdc_remove()

From: Shawn Guo <shawnguo@kernel.org>
Date: 2021-05-23 05:11:53
Also in: lkml

On Mon, May 17, 2021 at 07:15:23PM +0800, Yang Yingliang wrote:
quoted hunk ↗ jump to hunk
clock source is prepared and enabled by clk_prepare_enable()
in probe function, but no disable or unprepare in remove.

Fixes: 9454a0caff6a ("ARM: imx: add mmdc ipg clock operation for mmdc")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Yang Yingliang <redacted>
---
 arch/arm/mach-imx/mmdc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index 0dfd0ae7a63d..7d87fa8c70a9 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -77,6 +77,7 @@ static const struct of_device_id imx_mmdc_dt_ids[] = {
 	{ /* sentinel */ }
 };
 
+struct clk *mmdc_ipg_clk;
Missing static.  But an even better change should be putting it into
struct mmdc_pmu, I guess.

Shawn
quoted hunk ↗ jump to hunk
 #ifdef CONFIG_PERF_EVENTS
 
 static enum cpuhp_state cpuhp_mmdc_state;
@@ -463,6 +464,7 @@ 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);
 	kfree(pmu_mmdc);
+	clk_disable_unprepare(mmdc_ipg_clk);
 	return 0;
 }
 
@@ -536,7 +538,6 @@ static int imx_mmdc_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
 	void __iomem *mmdc_base, *reg;
-	struct clk *mmdc_ipg_clk;
 	u32 val;
 	int err;
 
-- 
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help