Commit 1ffae361 authored Oct 29, 2014 by Lars-Peter Clausen Committed by Mark Brown Oct 29, 2014

ASoC: Fix snd_soc_find_dai() matching component by name

Commit 14621c7e ("ASoC: Consolidate CPU and CODEC DAI lookup")
consolidated the lookup of CPU DAIs and CODEC DAIs into a single function.
When matching a component by name for CODEC DAIs the code previous to the
patch compared the name in the DAI link table with component->name. For CPU
DAIs the code compared to dev_name(component->dev). The newly introduced
function ended up using the later as well.

For most components dev_name(component->dev) and component->name are the
same. The main notable exception are I2C devices where the driver name and
the device name are concatenated to form the component name. By using
dev_name(component->dev) instead of component->name the patch broke the
matching of I2C CODECs by name.

This patch restores the original behavior by using component->name instead
of dev_name(component->dev). This will be safe even for CPU DAIs since for
CPU DAIs both are the same.

Fixes: 14621c7e ("ASoC: Consolidate CPU and CODEC DAI lookup")
Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent f114040e

sound/soc/soc-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

Admin message