]> git.hungrycats.org Git - linux/commitdiff
mmc: sdhci: Allow for irq being shared
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 11 Mar 2014 08:09:36 +0000 (10:09 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 3 May 2016 15:42:13 +0000 (17:42 +0200)
commit 655bca7616bf6076d30b14d1478bca6807d49c45 upstream.

If the SDHCI irq is shared with another device then the interrupt
handler can get called while SDHCI is runtime suspended.  That is
harmless but the warning message is not useful so remove it.  Also
returning IRQ_NONE is more appropriate.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <chris@printf.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/mmc/host/sdhci.c

index 4aa4d2d1893367eb2c47030e0cf063d41ed97f00..4e697ea67ae2bc6900010c5e929ad93ddedee838 100644 (file)
@@ -2417,9 +2417,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
 
        if (host->runtime_suspended) {
                spin_unlock(&host->lock);
-               pr_warning("%s: got irq while runtime suspended\n",
-                      mmc_hostname(host->mmc));
-               return IRQ_HANDLED;
+               return IRQ_NONE;
        }
 
        intmask = sdhci_readl(host, SDHCI_INT_STATUS);