Skip to content

L
linux
Commit 9450d92c authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 738867f9 a894bd7f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
sound/soc/soc-generic-dmaengine-pcm.c
View file @ 9450d92c
...@@ -25,7 +25,7 @@ ...@@ -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, ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7