| Message ID | 1383732985-18928-9-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/06/2013 11:16 AM, Lee Jones wrote: > We currently assume that the DMA Slave Config will be fully populated > by the platform, however some DMA Engines make decisions based on zero > (default) flags such as DMA_SLAVE_BUSWIDTH_UNDEFINED and as this is a > static declaration we need to memset it to clear the data area. > > Cc: alsa-devel@alsa-project.org > Cc: Mark Brown <broonie@kernel.org> > Signed-off-by: Lee Jones <lee.jones@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Thanks. > --- > sound/soc/soc-generic-dmaengine-pcm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c > index ee07903..6ad4c7a 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 >
On Wed, Nov 06, 2013 at 10:16:20AM +0000, Lee Jones wrote: > We currently assume that the DMA Slave Config will be fully populated > by the platform, however some DMA Engines make decisions based on zero > (default) flags such as DMA_SLAVE_BUSWIDTH_UNDEFINED and as this is a > static declaration we need to memset it to clear the data area. Applied, thanks - given how near we are to the merge window the whole series isn't going to go in for v3.13 but this ought to do so.
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index ee07903..6ad4c7a 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
We currently assume that the DMA Slave Config will be fully populated by the platform, however some DMA Engines make decisions based on zero (default) flags such as DMA_SLAVE_BUSWIDTH_UNDEFINED and as this is a static declaration we need to memset it to clear the data area. Cc: alsa-devel@alsa-project.org Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- sound/soc/soc-generic-dmaengine-pcm.c | 2 ++ 1 file changed, 2 insertions(+)