summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorAdrian Hunter2014-03-11 09:09:36 +0100
committerChris Ball2014-03-17 14:13:02 +0100
commit655bca7616bf6076d30b14d1478bca6807d49c45 (patch)
treebd58539e666b82ae7b934f924320a5598f851beb /drivers/mmc/host/sdhci.c
parentmmc: sdhci-acpi: Add device id 80860F16 (diff)
downloadkernel-qcow2-linux-655bca7616bf6076d30b14d1478bca6807d49c45.tar.gz
kernel-qcow2-linux-655bca7616bf6076d30b14d1478bca6807d49c45.tar.xz
kernel-qcow2-linux-655bca7616bf6076d30b14d1478bca6807d49c45.zip
mmc: sdhci: Allow for irq being shared
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>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-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 7f95211e9449..04a5e257a2ab 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2434,9 +2434,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);