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

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 0c469cbbe8814f512a6f2f43d0b319cb35088dbd..6ad4c7a47f5da0f3513e9c3c962a4435420fa1f5 100644 (file)
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/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