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

Commit fe6e0494 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi_internal_dmac: Fix missing unmap in error patch 



This patch fixes an issue that lacks the dma_unmap_sg() calling in
the error patch of renesas_sdhi_internal_dmac_start_dma().

Fixes: 0cbc94da ("mmc: renesas_sdhi_internal_dmac: limit DMA RX for old SoCs")
Cc: <stable@vger.kernel.org> # v4.17+
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 021c9179

drivers/mmc/host/renesas_sdhi_internal_dmac.c

+6 −6
Original line number Diff line number Diff line
@@ -164,17 +164,14 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, 
		goto force_pio;



	/* This DMAC cannot handle if buffer is not 8-bytes alignment */

	if (!IS_ALIGNED(sg_dma_address(sg), 8)) {

		dma_unmap_sg(&host->pdev->dev, sg, host->sg_len,

			     mmc_get_dma_dir(data));

		goto force_pio;

	}

	if (!IS_ALIGNED(sg_dma_address(sg), 8))

		goto force_pio_with_unmap;



	if (data->flags & MMC_DATA_READ) {

		dtran_mode |= DTRAN_MODE_CH_NUM_CH1;

		if (test_bit(SDHI_INTERNAL_DMAC_ONE_RX_ONLY, &global_flags) &&

		    test_and_set_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags))

			goto force_pio;

			goto force_pio_with_unmap;

	} else {

		dtran_mode |= DTRAN_MODE_CH_NUM_CH0;

	}
@@ -189,6 +186,9 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host, 


	return;



force_pio_with_unmap:

	dma_unmap_sg(&host->pdev->dev, sg, host->sg_len, mmc_get_dma_dir(data));



force_pio:

	host->force_pio = true;

	renesas_sdhi_internal_dmac_enable_dma(host, false);