redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Mark Brown 2013-11-20 15:20:31 +00:00
parent ac5f1ad349 a894bd7fb5
commit 971a6f45e0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/soc/soc-generic-dmaengine-pcm.c
View file

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