aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-13 10:48:04 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2011-12-23 11:03:15 -0500
commita4e3e86d66ffc640ac54acffa29450e327a80ae2 (patch)
tree7067dc62c57816151930a04b2fe21267f4c5258b /drivers
parent62268ce9170c5466332c046ff6ddafcb67751502 (diff)
mmc: mxs-mmc: fix the dma_transfer_direction migration
The commit 05f5799 (mmc-host: move to dma_transfer_direction) left out the DMA_NONE, in turn breaks the driver as below. [ 0.650000] mxs-mmc mxs-mmc.0: initialized [ 0.650000] mxs-mmc mxs-mmc.1: initialized [ 0.690000] mxs-dma mxs-dma-apbh: maximum bytes for sg entry exceeded: -55906 7475 > 65280 [ 0.690000] mxs-mmc mxs-mmc.0: mxs_mmc_ac: failed to prep dma Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/mxs-mmc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 0a878b18134..94d7358187f 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -357,6 +357,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)
357 host->ssp_pio_words[1] = cmd0; 357 host->ssp_pio_words[1] = cmd0;
358 host->ssp_pio_words[2] = cmd1; 358 host->ssp_pio_words[2] = cmd1;
359 host->dma_dir = DMA_NONE; 359 host->dma_dir = DMA_NONE;
360 host->slave_dirn = DMA_TRANS_NONE;
360 desc = mxs_mmc_prep_dma(host, 0); 361 desc = mxs_mmc_prep_dma(host, 0);
361 if (!desc) 362 if (!desc)
362 goto out; 363 goto out;
@@ -396,6 +397,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)
396 host->ssp_pio_words[1] = cmd0; 397 host->ssp_pio_words[1] = cmd0;
397 host->ssp_pio_words[2] = cmd1; 398 host->ssp_pio_words[2] = cmd1;
398 host->dma_dir = DMA_NONE; 399 host->dma_dir = DMA_NONE;
400 host->slave_dirn = DMA_TRANS_NONE;
399 desc = mxs_mmc_prep_dma(host, 0); 401 desc = mxs_mmc_prep_dma(host, 0);
400 if (!desc) 402 if (!desc)
401 goto out; 403 goto out;
@@ -514,6 +516,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
514 host->ssp_pio_words[1] = cmd0; 516 host->ssp_pio_words[1] = cmd0;
515 host->ssp_pio_words[2] = cmd1; 517 host->ssp_pio_words[2] = cmd1;
516 host->dma_dir = DMA_NONE; 518 host->dma_dir = DMA_NONE;
519 host->slave_dirn = DMA_TRANS_NONE;
517 desc = mxs_mmc_prep_dma(host, 0); 520 desc = mxs_mmc_prep_dma(host, 0);
518 if (!desc) 521 if (!desc)
519 goto out; 522 goto out;