Commit 6a6dafda authored Aug 24, 2017 by Jeffy Chen Committed by Mark Brown Aug 25, 2017

ASoC: Add a sanity check before using dai driver name



The dai driver's name is allowed to be NULL. So add a sanity check for
that.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reported-by: Donglin Peng <dolinux.peng@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 4958471b

sound/soc/soc-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1029,7 +1029,8 @@ struct snd_soc_dai *snd_soc_find_dai(
		continue;
		list_for_each_entry(dai, &component->dai_list, list) {
		if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)
		&& strcmp(dai->driver->name, dlc->dai_name))
		&& (!dai->driver->name
		\|\| strcmp(dai->driver->name, dlc->dai_name)))
		continue;

		return dai;