ASoC: Prevent components from being bound to multiple cards

A component can only be bound to a single card at a time. Binding it to
card while it is already bound to another will result in undefined
behavior.

As the undefined behavior might only manifest itself later on it is not
necessarily always straight forward to find the cause. To prevent this add
a check that refuses to bind a component to multiple cards as well as
prints a error describing the problem.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6ce621749f8d056d18fda727d6a000268c4e6a1b..96bb71aea529bd31ae691df97b49c747c09380ef 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1102,9 +1102,19 @@ static int soc_probe_component(struct snd_soc_card *card,
        struct snd_soc_dai *dai;
        int ret;
 
-       if (!strcmp(component->name, "snd-soc-dummy") || component->probed)
+       if (!strcmp(component->name, "snd-soc-dummy"))
                return 0;
 
+       if (component->probed) {
+               if (component->card != card) {
+                       dev_err(component->dev,
+                               "Trying to bind component to card \"%s\" but is already bound to card \"%s\"\n",
+                               card->name, component->card->name);
+                       return -ENODEV;
+               }
+               return 0;
+       }
+
        component->card = card;
        dapm->card = card;
        soc_set_name_prefix(card, component);