ASoC: soc-core: Increment codec and platform driver refcounts before probing

Commit f6c2ed5 "ASoC: Fix the device references to codec and platform drivers"
moved codec and platform driver refcount increments from soc_bind_dai_link
to more appropriate places.

Adjust a little them so that refcounts are incremented before executing the
driver probe functions.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Harsha Priya <priya.harsha@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e9f81c551e5e5ca3594153354fe4b4f3d58ce48f..9dfbb8fcb7654e09a5f6f08ea97c037beae9dc95 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1412,26 +1412,31 @@ static int soc_probe_codec(struct snd_soc_card *card,
        codec->dapm.card = card;
        soc_set_name_prefix(card, codec);
 
+       if (!try_module_get(codec->dev->driver->owner))
+               return -ENODEV;
+
        if (codec->driver->probe) {
                ret = codec->driver->probe(codec);
                if (ret < 0) {
                        dev_err(codec->dev,
                                "asoc: failed to probe CODEC %s: %d\n",
                                codec->name, ret);
-                       return ret;
+                       goto err_probe;
                }
        }
 
        soc_init_codec_debugfs(codec);
 
        /* mark codec as probed and add to card codec list */
-       if (!try_module_get(codec->dev->driver->owner))
-               return -ENODEV;
-
        codec->probed = 1;
        list_add(&codec->card_list, &card->codec_dev_list);
        list_add(&codec->dapm.list, &card->dapm_list);
 
+       return 0;
+
+err_probe:
+       module_put(codec->dev->driver->owner);
+
        return ret;
 }
 
@@ -1549,19 +1554,19 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num)
 
        /* probe the platform */
        if (!platform->probed) {
+               if (!try_module_get(platform->dev->driver->owner))
+                       return -ENODEV;
+
                if (platform->driver->probe) {
                        ret = platform->driver->probe(platform);
                        if (ret < 0) {
                                printk(KERN_ERR "asoc: failed to probe platform %s\n",
                                                platform->name);
+                               module_put(platform->dev->driver->owner);
                                return ret;
                        }
                }
                /* mark platform as probed and add to card platform list */
-
-               if (!try_module_get(platform->dev->driver->owner))
-                       return -ENODEV;
-
                platform->probed = 1;
                list_add(&platform->card_list, &card->platform_dev_list);
        }