Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'asoc/topic/core' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2016-12-12 15:52:43 +00:00
commit 3f1b86139e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/soc-core.c
View file

@ -993,6 +993,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link_component cpu_dai_component; struct snd_soc_dai_link_component cpu_dai_component;
struct snd_soc_dai **codec_dais; struct snd_soc_dai **codec_dais;
struct snd_soc_platform *platform; struct snd_soc_platform *platform;
struct device_node *platform_of_node;
const char *platform_name; const char *platform_name;
int i; int i;
@ -1042,9 +1043,12 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
/* find one from the set of registered platforms */ /* find one from the set of registered platforms */
list_for_each_entry(platform, &platform_list, list) { list_for_each_entry(platform, &platform_list, list) {
platform_of_node = platform->dev->of_node;
if (!platform_of_node && platform->dev->parent->of_node)
platform_of_node = platform->dev->parent->of_node;
if (dai_link->platform_of_node) { if (dai_link->platform_of_node) {
if (platform->dev->of_node != if (platform_of_node != dai_link->platform_of_node)
dai_link->platform_of_node)
continue; continue;
} else { } else {
if (strcmp(platform->component.name, platform_name)) if (strcmp(platform->component.name, platform_name))