diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-08 16:45:38 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-08 16:45:38 +0100 |
| commit | a6bc732b5a96b5403c2637e85c350b95ec6591f3 (patch) | |
| tree | 4b1c3967cd1de42a5e36e567cbdd18e1f4e8446f /sound/soc/soc-generic-dmaengine-pcm.c | |
| parent | 9a22a8f558d09a83965d2bbe168294eb8ffb70e9 (diff) | |
| parent | dd212bd5bb8b15889821ef79213cdb5bd47c6f85 (diff) | |
Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.13
Some additional fixes for v3.13, the majority of which are removals and
downgrades of BUG()s from Takashi.
Diffstat (limited to 'sound/soc/soc-generic-dmaengine-pcm.c')
| -rw-r--r-- | sound/soc/soc-generic-dmaengine-pcm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 51fded3640a..cbc9c96ce1f 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -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 |