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

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

mmc: sdhci: cleanup DMA un-mapping 



The patch "mmc: sdhci: plug DMA mapping leak on error" added
un-mapping logic to sdhci_tasklet_finish() where it is always
called, thereby preventing the mapping leaking.

Consequently the un-mapping code in sdhci_finish_data() is no
longer needed.  Remove it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
[ Split from original "mmc: sdhci: plug DMA mapping leak on error" patch ]
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 94538e51

drivers/mmc/host/sdhci.c

+3 −11
Original line number Diff line number Diff line
@@ -911,18 +911,10 @@ static void sdhci_finish_data(struct sdhci_host *host) 
	data = host->data;

	host->data = NULL;



	if (host->flags & SDHCI_REQ_USE_DMA) {

		if (host->flags & SDHCI_USE_ADMA)

	if ((host->flags & (SDHCI_REQ_USE_DMA | SDHCI_USE_ADMA)) ==

	    (SDHCI_REQ_USE_DMA | SDHCI_USE_ADMA))

		sdhci_adma_table_post(host, data);



		if (data->host_cookie == COOKIE_MAPPED) {

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

				     (data->flags & MMC_DATA_READ) ?

				     DMA_FROM_DEVICE : DMA_TO_DEVICE);

			data->host_cookie = COOKIE_UNMAPPED;

		}

	}



	/*

	 * The specification states that the block count register must

	 * be updated, but it does not specify at what point in the