Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

[platform/kernel/linux-rpi.git] / drivers / mmc / host / sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 369817a..a20aee5 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2935,6 +2935,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
                        result = IRQ_WAKE_THREAD;
                }
 
+               if ((intmask & SDHCI_INT_DATA_END) && !host->data &&
+                   host->cmd && (host->cmd == host->cmd->mrq->stop))
+                       intmask &= ~SDHCI_INT_DATA_END;
+
                if (intmask & SDHCI_INT_CMD_MASK)
                        sdhci_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK, &intmask);