Commit a1422b8c authored Mar 21, 2013 by Kuninori Morimoto Committed by Mark Brown Mar 26, 2013

ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]()



snd_soc_register_dai()  uses fmt_single_name(), and
snd_soc_register_dais() uses fmt_multiple_name()
for dai->name which is used for name based matching.
This patch uses properly snd_soc_register_dai() it it was single driver,
and uses snd_register_dais() if it were multiple drivers.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 995f2972

sound/soc/soc-core.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -4169,6 +4169,14 @@ int snd_soc_register_component(struct device *dev,
		cmpnt->driver = cmpnt_drv;
		cmpnt->num_dai = num_dai;

		/*
		* snd_soc_register_dai() uses fmt_single_name(), and
		* snd_soc_register_dais() uses fmt_multiple_name()
		* for dai->name which is used for name based matching
		*/
		if (1 == num_dai)
		ret = snd_soc_register_dai(dev, dai_drv);
		else
		ret = snd_soc_register_dais(dev, dai_drv, num_dai);
		if (ret < 0) {
		dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret);

Admin message