2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00

Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

This commit is contained in:
Mark Brown 2014-11-17 16:41:05 +00:00
commit a9aa32c542

View File

@ -884,7 +884,7 @@ static struct snd_soc_dai *snd_soc_find_dai(
list_for_each_entry(component, &component_list, list) { list_for_each_entry(component, &component_list, list) {
if (dlc->of_node && component->dev->of_node != dlc->of_node) if (dlc->of_node && component->dev->of_node != dlc->of_node)
continue; continue;
if (dlc->name && strcmp(dev_name(component->dev), dlc->name)) if (dlc->name && strcmp(component->name, dlc->name))
continue; continue;
list_for_each_entry(dai, &component->dai_list, list) { list_for_each_entry(dai, &component->dai_list, list) {
if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) if (dlc->dai_name && strcmp(dai->name, dlc->dai_name))