diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 07:02:29 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 07:02:29 -0500 |
| commit | 204e418bd2826423f7bacc6d4e15af8b0649e149 (patch) | |
| tree | 8995f6ed02a37140d8b00e4958b63ee8bc24c7a2 /sound/soc/mxs/mxs-pcm.c | |
| parent | 095d79dc491dab1311978e0efb252bc23da88b32 (diff) | |
| parent | da403f87a2599db34f611f198d744d54ed964e26 (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/mxs/mxs-pcm.c')
| -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, | |||
| 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_MEM_TO_DEV : DMA_DEV_TO_MEM); | 139 | DMA_TO_DEVICE : DMA_FROM_DEVICE); |
| 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; |