diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-18 14:06:56 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-06-18 14:06:56 +0200 |
| commit | 9d767dc55208f19f81767a2aa775f36010a1fb14 (patch) | |
| tree | af70b431f841537a899938838d2031dc1dd93b21 /drivers/mmc/core/sdio.c | |
| parent | 6e8e1acda6aab9638c15c085dbef1dc429c1e87e (diff) | |
| parent | 83293386bc95cf5e9f0c0175794455835bd1cb4a (diff) | |
| download | linux-9d767dc55208f19f81767a2aa775f36010a1fb14.tar.gz linux-9d767dc55208f19f81767a2aa775f36010a1fb14.tar.bz2 linux-9d767dc55208f19f81767a2aa775f36010a1fb14.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/core/sdio.c')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index d1aa1c7577bb..712a7742765e 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -937,6 +937,10 @@ static int mmc_sdio_pre_suspend(struct mmc_host *host) */ static int mmc_sdio_suspend(struct mmc_host *host) { + /* Prevent processing of SDIO IRQs in suspended state. */ + mmc_card_set_suspended(host->card); + cancel_delayed_work_sync(&host->sdio_irq_work); + mmc_claim_host(host); if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) @@ -985,13 +989,20 @@ static int mmc_sdio_resume(struct mmc_host *host) err = sdio_enable_4bit_bus(host->card); } - if (!err && host->sdio_irqs) { + if (err) + goto out; + + /* Allow SDIO IRQs to be processed again. */ + mmc_card_clr_suspended(host->card); + + if (host->sdio_irqs) { if (!(host->caps2 & MMC_CAP2_SDIO_IRQ_NOTHREAD)) wake_up_process(host->sdio_irq_thread); else if (host->caps & MMC_CAP_SDIO_IRQ) host->ops->enable_sdio_irq(host, 1); } +out: mmc_release_host(host); host->pm_flags &= ~MMC_PM_KEEP_POWER; |