aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-01-16 03:08:04 -0500
committerMark Brown <broonie@linaro.org>2014-01-16 09:11:49 -0500
commitec4f2857cd41b7c5af6350e7ab2a8fe1874dae59 (patch)
tree15229e716b34f21fdd633c13e1a47efbecce22f8 /sound/soc
parentd70e861a3154833467023123e218e9b1ba558809 (diff)
ASoC: core: Fix possible NULL pointer dereference of pcm->config
Since the soc generic dmaengine pcm driver allows using the defualt settings, so the pcm->config maybe NULL. Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-generic-dmaengine-pcm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 560a7787d8a7..5bace124ef43 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
176{ 176{
177 struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform); 177 struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
178 struct snd_dmaengine_dai_dma_data *dma_data; 178 struct snd_dmaengine_dai_dma_data *dma_data;
179 dma_filter_fn fn = NULL;
179 180
180 dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); 181 dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
181 182
182 if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0]) 183 if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
183 return pcm->chan[0]; 184 return pcm->chan[0];
184 185
185 if (pcm->config->compat_request_channel) 186 if (pcm->config && pcm->config->compat_request_channel)
186 return pcm->config->compat_request_channel(rtd, substream); 187 return pcm->config->compat_request_channel(rtd, substream);
187 188
188 return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn, 189 if (pcm->config)
189 dma_data->filter_data); 190 fn = pcm->config->compat_filter_fn;
191
192 return snd_dmaengine_pcm_request_channel(fn, dma_data->filter_data);
190} 193}
191 194
192static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan) 195static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan)