Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e61f7838 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 7d433e6a 721118f0

drivers/mmc/core/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ int mmc_add_card(struct mmc_card *card) 
		return ret;



	mmc_card_set_present(card);

	device_enable_async_suspend(&card->dev);



	return 0;

}

drivers/mmc/host/sdhci-msm.c

+1 −1
Original line number Diff line number Diff line
@@ -5009,7 +5009,7 @@ static int sdhci_msm_suspend_noirq(struct device *dev) 
}



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,

			   NULL)

	.suspend_noirq = sdhci_msm_suspend_noirq,