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

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

Merge "mmc: core: Suspend cqe during sdhci_msm_reset"

parents 4fc03f6e aba7a783

drivers/mmc/core/mmc.c

+0 −5
Original line number Diff line number Diff line
@@ -2557,11 +2557,6 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend) 
	if (mmc_card_suspended(host->card))

		goto out;



	if (host->cqe_enabled) {

		host->cqe_ops->cqe_disable(host);

		host->cqe_enabled = false;

	}



	if (mmc_card_doing_bkops(host->card)) {

		err = mmc_stop_bkops(host->card);

		if (err)

drivers/mmc/host/sdhci-msm.c

+2 −0
Original line number Diff line number Diff line
@@ -4102,6 +4102,8 @@ static void sdhci_msm_reset(struct sdhci_host *host, u8 mask) 
	}



	sdhci_reset(host, mask);

	if (host->mmc->caps2 & MMC_CAP2_CQE)

		cqhci_suspend(host->mmc);

}



/*