mmc: mmci_sdmmc: Fix clear busyd0end irq flag

commit d4a384cb563e555ce00255f5f496b503e6cc6358 upstream.

The busyd0 line transition can be very fast. The busy request may be
completed by busy_d0end, without waiting for the busy_d0 steps. Therefore,
clear the busyd0end irq flag, even if no busy_status.

Fixes: 0e68de6aa7b1 ("mmc: mmci: sdmmc: add busy_complete callback")
Cc: stable@vger.kernel.org
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Link: https://lore.kernel.org/r/20200325143409.13005-2-ludovic.barre@st.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/host/mmci_stm32_sdmmc.c b/drivers/mmc/host/mmci_stm32_sdmmc.c
index a4f7e8e689d3a16190ed67114ce7da06b49766f7..01f2227589107cde7c94fe266108acf701ab4662 100644 (file)
--- a/drivers/mmc/host/mmci_stm32_sdmmc.c
+++ b/drivers/mmc/host/mmci_stm32_sdmmc.c
@@ -315,11 +315,11 @@ complete:
        if (host->busy_status) {
                writel_relaxed(mask & ~host->variant->busy_detect_mask,
                               base + MMCIMASK0);
-               writel_relaxed(host->variant->busy_detect_mask,
-                              base + MMCICLEAR);
                host->busy_status = 0;
        }
 
+       writel_relaxed(host->variant->busy_detect_mask, base + MMCICLEAR);
+
        return true;
 }