diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 13:02:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 13:02:29 +0100 |
| commit | 204e418bd2826423f7bacc6d4e15af8b0649e149 (patch) | |
| tree | 8995f6ed02a37140d8b00e4958b63ee8bc24c7a2 /sound/soc | |
| parent | ASoC: samsung: Add .owner to struct snd_soc_card (diff) | |
| parent | Revert "ASoC: mxs: correct 'direction' of device_prep_dma_cyclic" (diff) | |
| download | linux-204e418bd2826423f7bacc6d4e15af8b0649e149.tar.xz linux-204e418bd2826423f7bacc6d4e15af8b0649e149.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/mxs/mxs-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index 105f42a394df..0e12f4e0a76d 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; |