All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mmc: sunxi-mmc: Fix clock refcount imbalance during unbind
@ 2022-08-10  2:25 ` Samuel Holland
  0 siblings, 0 replies; 12+ messages in thread
From: Samuel Holland @ 2022-08-10  2:25 UTC (permalink / raw)
  To: Chen-Yu Tsai, Jernej Skrabec, Ulf Hansson, Wolfram Sang
  Cc: Samuel Holland, Andre Przywara, Maxime Ripard, linux-arm-kernel,
	linux-kernel, linux-mmc, linux-sunxi

If the controller is suspended by runtime PM, the clock is already
disabled, so do not try to disable it again during removal. Use
pm_runtime_disable() to flush any pending runtime PM transitions.

Fixes: 9a8e1e8cc2c0 ("mmc: sunxi: Add runtime_pm support")
Signed-off-by: Samuel Holland <samuel@sholland.org>
---

 drivers/mmc/host/sunxi-mmc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index b16e12e62e72..3db9f32d6a7b 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1492,9 +1492,11 @@ static int sunxi_mmc_remove(struct platform_device *pdev)
 	struct sunxi_mmc_host *host = mmc_priv(mmc);
 
 	mmc_remove_host(mmc);
-	pm_runtime_force_suspend(&pdev->dev);
-	disable_irq(host->irq);
-	sunxi_mmc_disable(host);
+	pm_runtime_disable(&pdev->dev);
+	if (!pm_runtime_status_suspended(&pdev->dev)) {
+		disable_irq(host->irq);
+		sunxi_mmc_disable(host);
+	}
 	dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma);
 	mmc_free_host(mmc);
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-01-02 15:11 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-10  2:25 [PATCH] mmc: sunxi-mmc: Fix clock refcount imbalance during unbind Samuel Holland
2022-08-10  2:25 ` Samuel Holland
2022-08-14  8:22 ` Jernej Škrabec
2022-08-14  8:22   ` Jernej Škrabec
2022-08-14 17:56   ` Samuel Holland
2022-08-14 17:56     ` Samuel Holland
2022-08-15 10:11 ` Ulf Hansson
2022-08-15 10:11   ` Ulf Hansson
2023-01-01 19:25   ` Samuel Holland
2023-01-01 19:25     ` Samuel Holland
2023-01-02 15:07     ` Ulf Hansson
2023-01-02 15:07       ` Ulf Hansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.