summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2014-03-11 12:09:36 +0400
committerJiri Slaby <jslaby@suse.cz>2016-05-03 18:42:13 +0300
commitd9a229158da32c2a45129362c85b3c9eb3c64bcc (patch)
tree40f0176d3ca9bfca1d9fbd5cec5e0aca1e49461c
parent928efcfeabf11efc514cd8871a8debec9520467f (diff)
downloadlinux-d9a229158da32c2a45129362c85b3c9eb3c64bcc.tar.xz
mmc: sdhci: Allow for irq being shared
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>
-rw-r--r--drivers/mmc/host/sdhci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 4aa4d2d18933..4e697ea67ae2 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -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);