Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Adrian Hunter and committed by
Ulf Hansson
d5d568fa 9c316b38

+7 -2
+7 -2
drivers/mmc/host/sdhci.c
··· 2928 2928 irq_val |= SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE; 2929 2929 } 2930 2930 2931 - wake_val |= SDHCI_WAKE_ON_INT; 2932 - irq_val |= SDHCI_INT_CARD_INT; 2931 + if (mmc_card_wake_sdio_irq(host->mmc)) { 2932 + wake_val |= SDHCI_WAKE_ON_INT; 2933 + irq_val |= SDHCI_INT_CARD_INT; 2934 + } 2935 + 2936 + if (!irq_val) 2937 + return false; 2933 2938 2934 2939 val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL); 2935 2940 val &= ~mask;