Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6c098a1 authored by Brian Norris's avatar Brian Norris Committed by Mark Brown
Browse files

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



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: 99b04f4c ("ASoC: add Component level pcm_new/pcm_free")
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c1ae3cfa

sound/soc/soc-core.c

+6 −2
Original line number Diff line number Diff line
@@ -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;



	if (platform->driver->pcm_new)

		return platform->driver->pcm_new(rtd);

	else

		return 0;

}



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_platform *platform = rtd->platform;



	if (platform->driver->pcm_free)

		platform->driver->pcm_free(pcm);

}