* [PATCH] ASoC: dmaengine: Add config parameter NULL check.
@ 2013-12-17 7:16 Xiubo Li
2013-12-17 7:12 ` Lars-Peter Clausen
2013-12-17 11:18 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Xiubo Li @ 2013-12-17 7:16 UTC (permalink / raw)
To: lars, lgirdwood, broonie, perex, tiwai; +Cc: alsa-devel, linux-kernel
Because the "ASoC: dmaengine-pcm: Provide default config" has provided
us one defualt config of DMA. When using this, the config parameter of
devm_snd_dmaengine_pcm_register() will be NULL, so here we need to have
a check before using it.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/soc-generic-dmaengine-pcm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 7483922..2a6c569 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -299,7 +299,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
!dev->of_node)
return 0;
- if (config->dma_dev) {
+ if (config && config->dma_dev) {
/*
* If this warning is seen, it probably means that your Linux
* device structure does not match your HW device structure.
@@ -317,7 +317,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
name = "rx-tx";
else
name = dmaengine_pcm_dma_channel_names[i];
- if (config->chan_names[i])
+ if (config && config->chan_names[i])
name = config->chan_names[i];
chan = dma_request_slave_channel_reason(dev, name);
if (IS_ERR(chan)) {
--
1.8.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: dmaengine: Add config parameter NULL check.
2013-12-17 7:16 [PATCH] ASoC: dmaengine: Add config parameter NULL check Xiubo Li
@ 2013-12-17 7:12 ` Lars-Peter Clausen
2013-12-17 11:18 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Lars-Peter Clausen @ 2013-12-17 7:12 UTC (permalink / raw)
To: Xiubo Li; +Cc: alsa-devel, tiwai, linux-kernel, lgirdwood, broonie
On 12/17/2013 08:16 AM, Xiubo Li wrote:
> Because the "ASoC: dmaengine-pcm: Provide default config" has provided
> us one defualt config of DMA. When using this, the config parameter of
> devm_snd_dmaengine_pcm_register() will be NULL, so here we need to have
> a check before using it.
>
> Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Thanks.
> ---
> sound/soc/soc-generic-dmaengine-pcm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
> index 7483922..2a6c569 100644
> --- a/sound/soc/soc-generic-dmaengine-pcm.c
> +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> @@ -299,7 +299,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
> !dev->of_node)
> return 0;
>
> - if (config->dma_dev) {
> + if (config && config->dma_dev) {
> /*
> * If this warning is seen, it probably means that your Linux
> * device structure does not match your HW device structure.
> @@ -317,7 +317,7 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
> name = "rx-tx";
> else
> name = dmaengine_pcm_dma_channel_names[i];
> - if (config->chan_names[i])
> + if (config && config->chan_names[i])
> name = config->chan_names[i];
> chan = dma_request_slave_channel_reason(dev, name);
> if (IS_ERR(chan)) {
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: dmaengine: Add config parameter NULL check.
2013-12-17 7:16 [PATCH] ASoC: dmaengine: Add config parameter NULL check Xiubo Li
2013-12-17 7:12 ` Lars-Peter Clausen
@ 2013-12-17 11:18 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2013-12-17 11:18 UTC (permalink / raw)
To: Xiubo Li; +Cc: alsa-devel, lars, tiwai, linux-kernel, lgirdwood
[-- Attachment #1.1: Type: text/plain, Size: 323 bytes --]
On Tue, Dec 17, 2013 at 03:16:40PM +0800, Xiubo Li wrote:
> Because the "ASoC: dmaengine-pcm: Provide default config" has provided
> us one defualt config of DMA. When using this, the config parameter of
> devm_snd_dmaengine_pcm_register() will be NULL, so here we need to have
> a check before using it.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-17 11:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-17 7:16 [PATCH] ASoC: dmaengine: Add config parameter NULL check Xiubo Li
2013-12-17 7:12 ` Lars-Peter Clausen
2013-12-17 11:18 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).