diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2019-01-25 16:04:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-25 17:56:05 +0000 |
| commit | d0b95e6cd298a785c126e75a085af6dd7b7b1f60 (patch) | |
| tree | b73f6a3b3e2e457c7f98b7762f9d292775bb39a0 | |
| parent | 8077ec011b1ea26abb7ca786f28ecccfb352717f (diff) | |
| download | linux-d0b95e6cd298a785c126e75a085af6dd7b7b1f60.tar.bz2 | |
ASoC: core: Allow soc_find_component lookups to match parent of_node
For devices implemented as a MFD it is common to only have a single node
in devicetree representing the whole device. As such when looking up
components in soc_find_components we should match against both the devices
of_node and the devices parent's of_node, as is already done in the rest
of the ASoC core.
This causes regressions for some DAI links at the moment as
soc_find_component was recently added as a check in soc_init_dai_link.
Fixes: 8780cf1142a5 ("ASoC: soc-core: defer card probe until all component is added to list")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index aae450ba4f08..ea16c2b199ce 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -735,12 +735,17 @@ static struct snd_soc_component *soc_find_component( const struct device_node *of_node, const char *name) { struct snd_soc_component *component; + struct device_node *component_of_node; lockdep_assert_held(&client_mutex); for_each_component(component) { if (of_node) { - if (component->dev->of_node == of_node) + component_of_node = component->dev->of_node; + if (!component_of_node && component->dev->parent) + component_of_node = component->dev->parent->of_node; + + if (component_of_node == of_node) return component; } else if (name && strcmp(component->name, name) == 0) { return component; |