summaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-20 00:53:23 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-20 00:53:23 +0000
commit0a1fe66698a641fdaf92a130131981f2c19d8f6b (patch)
treebc2e2c76725d10255ba79c620397d72d184432d6 /sound/soc/mxs
parentf49f85108b2b3b1aaa7632418411c401fbb6741c (diff)
parentdbec3b30a601791717bc5bb827e210c3b5d6e067 (diff)
downloadlinux-0a1fe66698a641fdaf92a130131981f2c19d8f6b.tar.bz2
Merge branch 'for-3.2' into for-3.3
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 0e12f4e0a76d..105f42a394df 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;