summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-14 15:47:46 +0800
committerVinod Koul <vinod.koul@linux.intel.com>2011-12-23 22:05:22 +0530
commitd6077c92b6c51299eac7c2673631d6394ee2191a (patch)
treedbbe7db2f0222898cc8b0e8269128437a0cc0dda /sound/soc
parent2a0ff7a602714990b10a8749e908dad48401138e (diff)
downloadblackbird-op-linux-d6077c92b6c51299eac7c2673631d6394ee2191a.tar.gz
blackbird-op-linux-d6077c92b6c51299eac7c2673631d6394ee2191a.zip
ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
The commit 49920bc (dmaengine: add new enum dma_transfer_direction) changes the type of parameter 'direction' of device_prep_dma_cyclic from dma_data_direction to dma_transfer_direction. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/mxs/mxs-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index dea5aa4aa647..4b48a169e89c 100644
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@ -136,7 +136,7 @@ static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream,
iprtd->period_bytes * iprtd->periods,
iprtd->period_bytes,
substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
- DMA_TO_DEVICE : DMA_FROM_DEVICE);
+ DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);
if (!iprtd->desc) {
dev_err(&chan->dev->device, "cannot prepare slave dma\n");
return -EINVAL;
OpenPOWER on IntegriCloud