evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mmc: core: enable async suspend of card"

Browse source
This commit is contained in:
Linux Build Service Account 2017-09-11 19:12:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit bdb943e519
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/mmc/core/bus.c
View file

@ -401,6 +401,7 @@ int mmc_add_card(struct mmc_card *card)
return ret; return ret;
mmc_card_set_present(card); mmc_card_set_present(card);
device_enable_async_suspend(&card->dev);
return 0; return 0;
} }

2
drivers/mmc/host/sdhci-msm.c
View file

@ -5015,7 +5015,7 @@ static int sdhci_msm_suspend_noirq(struct device *dev)
} }
static const struct dev_pm_ops sdhci_msm_pmops = { static const struct dev_pm_ops sdhci_msm_pmops = {
SET_SYSTEM_SLEEP_PM_OPS(sdhci_msm_suspend, sdhci_msm_resume) SET_LATE_SYSTEM_SLEEP_PM_OPS(sdhci_msm_suspend, sdhci_msm_resume)
SET_RUNTIME_PM_OPS(sdhci_msm_runtime_suspend, sdhci_msm_runtime_resume, SET_RUNTIME_PM_OPS(sdhci_msm_runtime_suspend, sdhci_msm_runtime_resume,
NULL) NULL)
.suspend_noirq = sdhci_msm_suspend_noirq, .suspend_noirq = sdhci_msm_suspend_noirq,