evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sh_mmcif: Fix DMA slave address configuration

Browse source 
Commit e5a233cb64 ("mmc: sh_mmcif:
Factorize DMA channel request and configuration code") incorrectly
set the destination address for both slave channels instead of setting
the source address for the receive channel. Fix that.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Laurent Pinchart 2014-07-16 00:45:12 +02:00 • committed by Ulf Hansson
parent b4c27763d7
commit d25006e7e5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -386,7 +386,7 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
struct sh_mmcif_plat_data *pdata, struct sh_mmcif_plat_data *pdata,
enum dma_transfer_direction direction) enum dma_transfer_direction direction)
{ {
struct dma_slave_config cfg; struct dma_slave_config cfg = { 0, };
struct dma_chan *chan; struct dma_chan *chan;
unsigned int slave_id; unsigned int slave_id;
struct resource *res; struct resource *res;
@ -417,8 +417,12 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
/* In the OF case the driver will get the slave ID from the DT */ /* In the OF case the driver will get the slave ID from the DT */
cfg.slave_id = slave_id; cfg.slave_id = slave_id;
cfg.direction = direction; cfg.direction = direction;
if (direction == DMA_DEV_TO_MEM)
cfg.src_addr = res->start + MMCIF_CE_DATA;
else
cfg.dst_addr = res->start + MMCIF_CE_DATA; cfg.dst_addr = res->start + MMCIF_CE_DATA;
cfg.src_addr = 0;
ret = dmaengine_slave_config(chan, &cfg); ret = dmaengine_slave_config(chan, &cfg);
if (ret < 0) { if (ret < 0) {
dma_release_channel(chan); dma_release_channel(chan);