Browse Source

Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus

Mark Brown 11 years ago
parent
commit
971a6f45e0
1 changed files with 3 additions and 1 deletions
  1. 3 1
      sound/soc/soc-generic-dmaengine-pcm.c

+ 3 - 1
sound/soc/soc-generic-dmaengine-pcm.c

@@ -25,7 +25,7 @@
 #include <sound/dmaengine_pcm.h>
 
 struct dmaengine_pcm {
-	struct dma_chan *chan[SNDRV_PCM_STREAM_CAPTURE + 1];
+	struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1];
 	const struct snd_dmaengine_pcm_config *config;
 	struct snd_soc_platform platform;
 	unsigned int flags;
@@ -90,6 +90,8 @@ static int dmaengine_pcm_hw_params(struct snd_pcm_substream *substream,
 	struct dma_slave_config slave_config;
 	int ret;
 
+	memset(&slave_config, 0, sizeof(slave_config));
+
 	if (!pcm->config)
 		prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;
 	else