| From 8509419758f2cc28dd05370385af0d91573b76b4 Mon Sep 17 00:00:00 2001 |
| From: Samuel Holland <samuel@sholland.org> |
| Date: Tue, 9 Aug 2022 21:25:09 -0500 |
| Subject: mmc: sunxi-mmc: Fix clock refcount imbalance during unbind |
| |
| From: Samuel Holland <samuel@sholland.org> |
| |
| 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: 9a8e1e8cc2c0 ("mmc: sunxi: Add runtime_pm support") |
| Signed-off-by: Samuel Holland <samuel@sholland.org> |
| Acked-by: Jernej 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: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/mmc/host/sunxi-mmc.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/mmc/host/sunxi-mmc.c |
| +++ b/drivers/mmc/host/sunxi-mmc.c |
| @@ -1441,9 +1441,11 @@ static int sunxi_mmc_remove(struct platf |
| 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); |
| |
