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

Commit f48f039c authored by Russell King's avatar Russell King Committed by Ulf Hansson
Browse files

mmc: sdhci: always unmap a mapped data transfer in sdhci_post_req() 



If the host cookie indicates that the data buffers of a request are
mapped at sdhci_post_req() time, always unmap the data buffers.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c0999b72

drivers/mmc/host/sdhci.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2078,8 +2078,7 @@ static void sdhci_post_req(struct mmc_host *mmc, struct mmc_request *mrq, 
	struct sdhci_host *host = mmc_priv(mmc);

	struct sdhci_host *host = mmc_priv(mmc);

	struct mmc_data *data = mrq->data;

	struct mmc_data *data = mrq->data;





	if (data->host_cookie == COOKIE_GIVEN ||

	if (data->host_cookie != COOKIE_UNMAPPED)

	    data->host_cookie == COOKIE_MAPPED)

		dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,

		dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,

			     data->flags & MMC_DATA_WRITE ?

			     data->flags & MMC_DATA_WRITE ?

			       DMA_TO_DEVICE : DMA_FROM_DEVICE);

			       DMA_TO_DEVICE : DMA_FROM_DEVICE);