diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2017-08-22 15:57:21 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-22 13:45:55 +0100 |
| commit | 4958471b0d2110a34df0b45803e6f24ed89b857b (patch) | |
| tree | 4d73b3cfc8d8f3d035d10e75a41c343577a3f0f4 /sound/soc/soc-core.c | |
| parent | 2eccea8cdeb8fe455fc3a45b4e097f118449c3ef (diff) | |
| download | lwn-4958471b0d2110a34df0b45803e6f24ed89b857b.tar.gz lwn-4958471b0d2110a34df0b45803e6f24ed89b857b.zip | |
ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai
Currently we are searching dai name in snd_soc_find_dai, which could
either be dai driver name or component device name(for legacy naming).
Allow searching dai driver name in snd_soc_find_dai too, so that we can
use dai driver name to find legacy naming dais.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 50c8dba54649..6fab0ff213ef 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1000,7 +1000,7 @@ static struct snd_soc_component *soc_find_component( /** * snd_soc_find_dai - Find a registered DAI * - * @dlc: name of the DAI and optional component info to match + * @dlc: name of the DAI or the DAI driver and optional component info to match * * This function will search all registered components and their DAIs to * find the DAI of the same name. The component's of_node and name @@ -1028,7 +1028,8 @@ struct snd_soc_dai *snd_soc_find_dai( 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)) + if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) + && strcmp(dai->driver->name, dlc->dai_name)) continue; return dai; |