From: Xiubo Li Date: Tue, 17 Dec 2013 07:16:40 +0000 (+0800) Subject: ASoC: dmaengine: Add config parameter NULL check. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2b67f8ba41ac7acf01c8d5c742c713ead8b589cd;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ASoC: dmaengine: Add config parameter NULL check. 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 Acked-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 7483922f6ee3..2a6c569d991f 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)) {