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

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

Merge "mmc: host: Cancel clock gating work in suspend"

parents b9dedaed 8e231ff4

drivers/mmc/host/sdhci-msm.c

+3 −0
Original line number Diff line number Diff line
@@ -4607,6 +4607,7 @@ 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;

	struct mmc_host *mmc = host->mmc;

	int ret = 0;

	int sdio_cfg = 0;

	ktime_t start = ktime_get();
@@ -4622,6 +4623,8 @@ static int sdhci_msm_suspend(struct device *dev) 
	}

	ret = sdhci_msm_runtime_suspend(dev);

out:

	/* cancel any clock gating work scheduled by mmc_host_clk_release() */

	cancel_delayed_work_sync(&mmc->clk_gate_work);

	sdhci_msm_disable_controller_clock(host);

	if (host->mmc->card && mmc_card_sdio(host->mmc->card)) {

		sdio_cfg = sdhci_msm_cfg_sdio_wakeup(host, true);