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

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

mmc: sdhci: pass the cookie into sdhci_pre_dma_transfer() 



Pass the desired cookie for a successful map.  This is in preparation to
clean up the MAPPED/GIVEN states.

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 60c64762

drivers/mmc/host/sdhci.c

+4 −4
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host) 
}



static int sdhci_pre_dma_transfer(struct sdhci_host *host,

				  struct mmc_data *data)

				  struct mmc_data *data, int cookie)

{

	int sg_count;
@@ -446,7 +446,7 @@ static int sdhci_pre_dma_transfer(struct sdhci_host *host, 
		return -ENOSPC;



	data->sg_count = sg_count;

	data->host_cookie = COOKIE_MAPPED;

	data->host_cookie = cookie;



	return sg_count;

}
@@ -791,7 +791,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) 
	}



	if (host->flags & SDHCI_REQ_USE_DMA) {

		int sg_cnt = sdhci_pre_dma_transfer(host, data);

		int sg_cnt = sdhci_pre_dma_transfer(host, data, COOKIE_MAPPED);



		if (sg_cnt <= 0) {

			/*
@@ -2095,7 +2095,7 @@ static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq, 
	mrq->data->host_cookie = COOKIE_UNMAPPED;



	if (host->flags & SDHCI_REQ_USE_DMA)

		sdhci_pre_dma_transfer(host, mrq->data);

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

}



static void sdhci_card_event(struct mmc_host *mmc)