summaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-22 11:37:03 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-22 11:37:03 +0000
commitda403f87a2599db34f611f198d744d54ed964e26 (patch)
tree2e920ebb0934d2bccece1534bf42e5f4b8eedc45 /sound/soc/mxs
parentdbec3b30a601791717bc5bb827e210c3b5d6e067 (diff)
downloadblackbird-op-linux-da403f87a2599db34f611f198d744d54ed964e26.tar.gz
blackbird-op-linux-da403f87a2599db34f611f198d744d54ed964e26.zip
Revert "ASoC: mxs: correct 'direction' of device_prep_dma_cyclic"
This reverts commit dbec3b30a601791717bc5bb827e210c3b5d6e067 as it should never have been applied to the ASoC tree at all, let alone 3.2.
Diffstat (limited to 'sound/soc/mxs')
-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 5dfd3250ddf1..f39d7dd9fbcb 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_MEM_TO_DEV : DMA_DEV_TO_MEM);
+ DMA_TO_DEVICE : DMA_FROM_DEVICE);
if (!iprtd->desc) {
dev_err(&chan->dev->device, "cannot prepare slave dma\n");
return -EINVAL;
OpenPOWER on IntegriCloud