xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: don't dereference NULL pcm_{new,free}

Browse Source 
Not all platform drivers have pcm_{new,free} callbacks. Seen with a
"snd-soc-dummy" codec from sound/soc/rockchip/rk3399_gru_sound.c.

Fixes: 99b04f4c40 ("ASoC: add Component level pcm_new/pcm_free")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Brian Norris
2017-03-08 15:18:54 -08:00
committed by Mark Brown
parent c1ae3cfa0e
commit d6c098a1db
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/soc-core.c
View File

@@ -3326,7 +3326,10 @@ static int snd_soc_platform_drv_pcm_new(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_platform *platform = rtd->platform; struct snd_soc_platform *platform = rtd->platform;
if (platform->driver->pcm_new)
return platform->driver->pcm_new(rtd); return platform->driver->pcm_new(rtd);
else
return 0;
} }
static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm) static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm)
@@ -3334,6 +3337,7 @@ static void snd_soc_platform_drv_pcm_free(struct snd_pcm *pcm)
struct snd_soc_pcm_runtime *rtd = pcm->private_data; struct snd_soc_pcm_runtime *rtd = pcm->private_data;
struct snd_soc_platform *platform = rtd->platform; struct snd_soc_platform *platform = rtd->platform;
if (platform->driver->pcm_free)
platform->driver->pcm_free(pcm); platform->driver->pcm_free(pcm);
} }