diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:31 +0000 |
| commit | 971a6f45e071447975c33d6747f95a1e385d0f45 (patch) | |
| tree | 7f26683f76892d468d6cf4fea711f19b8fb167d1 /sound | |
| parent | ac5f1ad34981780921625e78d8316c35b3723c81 (diff) | |
| parent | a894bd7fb539d671149fea9420c94c0fbe6baf7a (diff) | |
| download | linux-971a6f45e071447975c33d6747f95a1e385d0f45.tar.gz linux-971a6f45e071447975c33d6747f95a1e385d0f45.tar.bz2 linux-971a6f45e071447975c33d6747f95a1e385d0f45.zip | |
Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 0c469cbbe881..6ad4c7a47f5d 100644 --- 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 |