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

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

Merge "mmc: block: Fix issue with deferred resume when CQ is enabled"

parents bf7be66d 15c8f04a

drivers/mmc/card/block.c

+0 −4
Original line number Diff line number Diff line
@@ -3855,10 +3855,6 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req) 


	mmc_get_card(card);



#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host))

		mmc_resume_bus(card->host);

#endif

	if (!card->host->cmdq_ctx.active_reqs && mmc_card_doing_bkops(card)) {

		ret = mmc_cmdq_halt(card->host, true);

		if (ret)

drivers/mmc/core/core.c

+4 −0
Original line number Diff line number Diff line
@@ -2148,6 +2148,10 @@ void mmc_get_card(struct mmc_card *card) 
{

	pm_runtime_get_sync(&card->dev);

	mmc_claim_host(card->host);

#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host))

		mmc_resume_bus(card->host);

#endif

}

EXPORT_SYMBOL(mmc_get_card);