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

Commit 61cad0c6 authored by Samuel Holland's avatar Samuel Holland Committed by Greg Kroah-Hartman
Browse files

mmc: sunxi-mmc: Fix clock refcount imbalance during unbind 



commit 8509419758f2cc28dd05370385af0d91573b76b4 upstream.

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: 9a8e1e8c ("mmc: sunxi: Add runtime_pm support")
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220810022509.43743-1-samuel@sholland.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f96ae71

drivers/mmc/host/sunxi-mmc.c

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

	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);