p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: core: Fix the DAI name getting. 

From "ASoC: make snd_soc_dai_link more symmetrical", can we see that
the name of CPU DAI maybe omitted. If the DAI name is omitted, try to
use the component name instead.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Xiubo Li 2013-12-20 14:39:51 +08:00 committed by Mark Brown
parent 95ab1297e7
commit e41975edc7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4617,10 +4617,14 @@ int snd_soc_of_get_dai_name(struct device_node *of_node,
if (id < 0 || id >= pos->num_dai) { if (id < 0 || id >= pos->num_dai) {
ret = -EINVAL; ret = -EINVAL;
} else { break;
*dai_name = pos->dai_drv[id].name;
ret = 0;
} }
ret = 0;
*dai_name = pos->dai_drv[id].name;
if (!*dai_name)
*dai_name = pos->name;
} }
break; break;