Merge branch 'for-3.2' into for-3.3

[~andy/linux] / sound / soc / mxs / mxs-pcm.c

diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index 105f42a394df6460e80899f22c567f3ac6192c7f..0e12f4e0a76d60ac10dab9b70ad4e12f80e0d0c7 100644 (file)
--- 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;