aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-04 01:04:16 -0500
committerMark Brown <broonie@linaro.org>2013-11-04 01:04:16 -0500
commit911885542a6dcb0fcd2e041d2c7fe229440bb751 (patch)
treed40cd77b762d9a15781e72c0adb284968ae83640
parent05e48b506434c8982816a0876dc2682c983bed7a (diff)
parentf82bf8e2c8be73ebd719807bf054721930371174 (diff)
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
-rw-r--r--sound/soc/soc-generic-dmaengine-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 0c469cbbe881..ee0790337ec9 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -25,7 +25,7 @@
25#include <sound/dmaengine_pcm.h> 25#include <sound/dmaengine_pcm.h>
26 26
27struct dmaengine_pcm { 27struct dmaengine_pcm {
28 struct dma_chan *chan[SNDRV_PCM_STREAM_CAPTURE + 1]; 28 struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1];
29 const struct snd_dmaengine_pcm_config *config; 29 const struct snd_dmaengine_pcm_config *config;
30 struct snd_soc_platform platform; 30 struct snd_soc_platform platform;
31 unsigned int flags; 31 unsigned int flags;