diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-17 11:41:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-17 11:41:05 -0500 |
| commit | a9aa32c5428c20d819b759124f9139e160a43914 (patch) | |
| tree | f08a68b3a6b8ec30ef522a0675bba4a35bb6a6ab | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
| parent | 1ffae3612fe53dd18b92e696ab4f29df319a508d (diff) | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4c8f8a23a0e9..b60ff56ebc0f 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -884,7 +884,7 @@ static struct snd_soc_dai *snd_soc_find_dai( | |||
| 884 | list_for_each_entry(component, &component_list, list) { | 884 | list_for_each_entry(component, &component_list, list) { |
| 885 | if (dlc->of_node && component->dev->of_node != dlc->of_node) | 885 | if (dlc->of_node && component->dev->of_node != dlc->of_node) |
| 886 | continue; | 886 | continue; |
| 887 | if (dlc->name && strcmp(dev_name(component->dev), dlc->name)) | 887 | if (dlc->name && strcmp(component->name, dlc->name)) |
| 888 | continue; | 888 | continue; |
| 889 | list_for_each_entry(dai, &component->dai_list, list) { | 889 | list_for_each_entry(dai, &component->dai_list, list) { |
| 890 | if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) | 890 | if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) |