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

Commit 12ddadab authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: Do not disable card detect IRQ on system suspend"

parents e70a8b88 83b8e7f5

drivers/mmc/host/sdhci-msm.c

+0 −12
Original line number Diff line number Diff line
@@ -5649,16 +5649,10 @@ static int sdhci_msm_runtime_resume(struct device *dev) 
static int sdhci_msm_suspend(struct device *dev)

{

	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_msm_host *msm_host = pltfm_host->priv;

	int ret = 0;

	int sdio_cfg = 0;

	ktime_t start = ktime_get();



	if (gpio_is_valid(msm_host->pdata->status_gpio) &&

			 (msm_host->mmc->slot.cd_irq >= 0))

		disable_irq(msm_host->mmc->slot.cd_irq);



	if (pm_runtime_suspended(dev)) {

		pr_debug("%s: %s: already runtime suspended\n",

		mmc_hostname(host->mmc), __func__);
@@ -5680,16 +5674,10 @@ static int sdhci_msm_suspend(struct device *dev) 
static int sdhci_msm_resume(struct device *dev)

{

	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_msm_host *msm_host = pltfm_host->priv;

	int ret = 0;

	int sdio_cfg = 0;

	ktime_t start = ktime_get();



	if (gpio_is_valid(msm_host->pdata->status_gpio) &&

			 (msm_host->mmc->slot.cd_irq >= 0))

		enable_irq(msm_host->mmc->slot.cd_irq);



	if (pm_runtime_suspended(dev)) {

		pr_debug("%s: %s: runtime suspended, defer system resume\n",

		mmc_hostname(host->mmc), __func__);