summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-17 16:41:05 +0000
committerMark Brown <broonie@kernel.org>2014-11-17 16:41:05 +0000
commita9aa32c5428c20d819b759124f9139e160a43914 (patch)
treef08a68b3a6b8ec30ef522a0675bba4a35bb6a6ab
parentfc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff)
parent1ffae3612fe53dd18b92e696ab4f29df319a508d (diff)
downloadop-kernel-dev-a9aa32c5428c20d819b759124f9139e160a43914.zip
op-kernel-dev-a9aa32c5428c20d819b759124f9139e160a43914.tar.gz
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4c8f8a2..b60ff56 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(
list_for_each_entry(component, &component_list, list) {
if (dlc->of_node && component->dev->of_node != dlc->of_node)
continue;
- if (dlc->name && strcmp(dev_name(component->dev), dlc->name))
+ if (dlc->name && strcmp(component->name, dlc->name))
continue;
list_for_each_entry(dai, &component->dai_list, list) {
if (dlc->dai_name && strcmp(dai->name, dlc->dai_name))
OpenPOWER on IntegriCloud