[ALSA] Fix lockdep warning in ASoC machine probe

Don't take the codec mutex during machine probe until we have registered
with ALSA, fixing a lockdep warning reported by Dmitry Baryshkov.
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 5 insertions, 2 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 5f86e033098f..9eb5479787c1 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1101,7 +1101,6 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
         struct snd_soc_machine *machine = socdev->machine;
         int ret = 0, i, ac97 = 0, err = 0;
 
-        mutex_lock(&codec->mutex);
         for(i = 0; i < machine->num_links; i++) {
                 if (socdev->machine->dai_link[i].init) {
                         err = socdev->machine->dai_link[i].init(codec);
@@ -1127,12 +1126,14 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
                 goto out;
         }
 
+        mutex_lock(&codec->mutex);
 #ifdef CONFIG_SND_SOC_AC97_BUS
         if (ac97) {
                 ret = soc_ac97_dev_register(codec);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: AC97 device register failed\n");
                         snd_card_free(codec->card);
+                        mutex_unlock(&codec->mutex);
                         goto out;
                 }
         }
@@ -1145,8 +1146,10 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
         err = device_create_file(socdev->dev, &dev_attr_codec_reg);
         if (err < 0)
                 printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n");
-out:
+
         mutex_unlock(&codec->mutex);
+
+out:
         return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_card);