diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-19 19:53:23 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-19 19:53:23 -0500 |
| commit | 0a1fe66698a641fdaf92a130131981f2c19d8f6b (patch) | |
| tree | bc2e2c76725d10255ba79c620397d72d184432d6 /sound/soc/mxs | |
| parent | f49f85108b2b3b1aaa7632418411c401fbb6741c (diff) | |
| parent | dbec3b30a601791717bc5bb827e210c3b5d6e067 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/mxs')
| -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 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, | |||
| 136 | iprtd->period_bytes * iprtd->periods, | 136 | iprtd->period_bytes * iprtd->periods, |
| 137 | iprtd->period_bytes, | 137 | iprtd->period_bytes, |
| 138 | substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? | 138 | substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? |
| 139 | DMA_TO_DEVICE : DMA_FROM_DEVICE); | 139 | DMA_MEM_TO_DEV : DMA_DEV_TO_MEM); |
| 140 | if (!iprtd->desc) { | 140 | if (!iprtd->desc) { |
| 141 | dev_err(&chan->dev->device, "cannot prepare slave dma\n"); | 141 | dev_err(&chan->dev->device, "cannot prepare slave dma\n"); |
| 142 | return -EINVAL; | 142 | return -EINVAL; |