mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

mmc: sdhci: pass the cookie into sdhci_pre_dma_transfer()

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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Russell King 2016-01-26 13:40:27 +00:00 committed by Ulf Hansson
parent 60c647624a
commit c0999b720c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mmc/host/sdhci.c
View file

@ -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)