Unverified Commit 596becd3 authored Aug 07, 2019 by Kuninori Morimoto Committed by Mark Brown Aug 08, 2019

ASoC: soc-core: dai_link check under soc_dpcm_debugfs_add()



soc_dpcm_debugfs_add(rtd) is checking rtd->dai_link pointer,
but, rtd->dai_link->dynamic have been already checked before calling it.

	static int soc_probe_link_dais(...) {
		dai_link = rtd->dai_link;
		...
=>		if (dai_link->dynamic)
=>			soc_dpcm_debugfs_add(rtd);
		...
	}

	void soc_dpcm_debugfs_add(rtd)
	{
=>		if (!rtd->dai_link)
			return;
		...
	}

These pointer checks are strange/pointless.
This patch checks dai_link->dynamic under soc_dpcm_debugfs_add().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874l2tahnq.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent ee5b3f11

sound/soc/soc-core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1488,7 +1488,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
		return ret;

		/* add DPCM sysfs entries */
		if (dai_link->dynamic)
		soc_dpcm_debugfs_add(rtd);

		num = rtd->num;

sound/soc/soc-pcm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -3200,6 +3200,9 @@ void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
		if (!rtd->dai_link)
		return;

		if (!rtd->dai_link->dynamic)
		return;

		if (!rtd->card->debugfs_card_root)
		return;

Admin message