mmc: sdhci: Do not unnecessarily enable wakeup for SDIO card interrupt

Do not enable wakeup for SDIO card interrupt unless the SDIO function
driver has requested it which is indicated by mmc_card_wake_sdio_irq().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 996845cb5af3760515bd7501bedd06e332df7ed9..2ededa7f43dffc37fb4fa27aeb8cde884fd6c14e 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2928,8 +2928,13 @@ static bool sdhci_enable_irq_wakeups(struct sdhci_host *host)
                irq_val |= SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE;
        }
 
-       wake_val |= SDHCI_WAKE_ON_INT;
-       irq_val |= SDHCI_INT_CARD_INT;
+       if (mmc_card_wake_sdio_irq(host->mmc)) {
+               wake_val |= SDHCI_WAKE_ON_INT;
+               irq_val |= SDHCI_INT_CARD_INT;
+       }
+
+       if (!irq_val)
+               return false;
 
        val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL);
        val &= ~mask;