diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2014-03-18 09:02:11 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-04-14 17:22:43 +0100 |
| commit | 98e639fb8a3ed1bf2bd512626c3cfc2992a57113 (patch) | |
| tree | b017a1a4c6cd07839eb449c6c7e76763fb5f6f4b /sound/soc/soc-core.c | |
| parent | ASoC: Remove IO register modifier callbacks (diff) | |
| download | linux-dev-98e639fb8a3ed1bf2bd512626c3cfc2992a57113.tar.xz linux-dev-98e639fb8a3ed1bf2bd512626c3cfc2992a57113.zip | |
ASoC: Track which components have been registered with snd_soc_register_component()
snd_soc_unregister_component() takes the parent device of the component as a
parameter and then looks up the component based on this. This is a problem if
multiple components are registered for the same parent device. Currently drivers
do not do this, but some drivers register a CPU DAI component and a platform for
the same parent device. This will become a problem once platforms are also made
components. To make sure that snd_soc_unregister_component() will not
accidentally unregister the platform in such a case only consider components
that were registered with snd_soc_register_component(). This is only meant as
short term stopgap solution to be able to continue componentisation. Long term
we'll need something different.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 41bd24348520..3314efb365e3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3879,6 +3879,7 @@ int snd_soc_register_component(struct device *dev, } cmpnt->ignore_pmdown_time = true; + cmpnt->registered_as_component = true; return __snd_soc_register_component(dev, cmpnt, cmpnt_drv, NULL, dai_drv, num_dai, true); @@ -3894,7 +3895,7 @@ void snd_soc_unregister_component(struct device *dev) struct snd_soc_component *cmpnt; list_for_each_entry(cmpnt, &component_list, list) { - if (dev == cmpnt->dev) + if (dev == cmpnt->dev && cmpnt->registered_as_component) goto found; } return; |