Merge tag 'vfs-6.7.misc' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs

[linux-block.git] / drivers / mmc / host / mtk-sd.c

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 5392200cfdf7a1230e4c0e2fb19736c74c7176b4..97f7c3d4be6ea910e615bab2bf08ad1e4a5fb726 100644 (file)
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -669,11 +669,11 @@ static void msdc_reset_hw(struct msdc_host *host)
        u32 val;
 
        sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_RST);
-       readl_poll_timeout(host->base + MSDC_CFG, val, !(val & MSDC_CFG_RST), 0, 0);
+       readl_poll_timeout_atomic(host->base + MSDC_CFG, val, !(val & MSDC_CFG_RST), 0, 0);
 
        sdr_set_bits(host->base + MSDC_FIFOCS, MSDC_FIFOCS_CLR);
-       readl_poll_timeout(host->base + MSDC_FIFOCS, val,
-                          !(val & MSDC_FIFOCS_CLR), 0, 0);
+       readl_poll_timeout_atomic(host->base + MSDC_FIFOCS, val,
+                                 !(val & MSDC_FIFOCS_CLR), 0, 0);
 
        val = readl(host->base + MSDC_INT);
        writel(val, host->base + MSDC_INT);