Merge tag 'mmc-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "MMC host: sdhci: Avoid hang when receiving spurious CARD_INT
  interrupts"

* tag 'mmc-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci: Ignore unexpected CARD_INT interrupts

parents 79c9089f 161e6d44

drivers/mmc/host/sdhci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2733,7 +2733,8 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
		if (intmask & SDHCI_INT_RETUNE)
		mmc_retune_needed(host->mmc);

		if (intmask & SDHCI_INT_CARD_INT) {
		if ((intmask & SDHCI_INT_CARD_INT) &&
		(host->ier & SDHCI_INT_CARD_INT)) {
		sdhci_enable_sdio_irq_nolock(host, false);
		host->thread_isr \|= SDHCI_INT_CARD_INT;
		result = IRQ_WAKE_THREAD;