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

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

Merge "mmc: sdhci: fix PM Qos code porting error"

parents 9ab19652 09cc6226

drivers/mmc/host/sdhci.c

+5 −2
Original line number Diff line number Diff line
@@ -2701,8 +2701,8 @@ static void sdhci_post_req(struct mmc_host *mmc, struct mmc_request *mrq, 


	data->host_cookie = COOKIE_UNMAPPED;



	if (host->ops->pre_req)

		host->ops->pre_req(host, mrq);

	if (host->ops->post_req)

		host->ops->post_req(host, mrq);

}



static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq,
@@ -2714,6 +2714,9 @@ static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq, 


	if (host->flags & SDHCI_REQ_USE_DMA)

		sdhci_pre_dma_transfer(host, mrq->data, COOKIE_PRE_MAPPED);



	if (host->ops->pre_req)

		host->ops->pre_req(host, mrq);

}



static inline bool sdhci_has_requests(struct sdhci_host *host)