diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-01-21 08:33:37 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:09 -0500 |
commit | 08c8efe6925ba712d65ca07877fa169b45f8d502 (patch) | |
tree | 62dc1418d0f518c8398bc413ffe9bc0fd3366a28 /sound | |
parent | c518b35ea2ef2b7b3dbe6b1cc5299daf0c9de3f7 (diff) |
[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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 7 |
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) | |||
1101 | struct snd_soc_machine *machine = socdev->machine; | 1101 | struct snd_soc_machine *machine = socdev->machine; |
1102 | int ret = 0, i, ac97 = 0, err = 0; | 1102 | int ret = 0, i, ac97 = 0, err = 0; |
1103 | 1103 | ||
1104 | mutex_lock(&codec->mutex); | ||
1105 | for(i = 0; i < machine->num_links; i++) { | 1104 | for(i = 0; i < machine->num_links; i++) { |
1106 | if (socdev->machine->dai_link[i].init) { | 1105 | if (socdev->machine->dai_link[i].init) { |
1107 | err = socdev->machine->dai_link[i].init(codec); | 1106 | err = socdev->machine->dai_link[i].init(codec); |
@@ -1127,12 +1126,14 @@ int snd_soc_register_card(struct snd_soc_device *socdev) | |||
1127 | goto out; | 1126 | goto out; |
1128 | } | 1127 | } |
1129 | 1128 | ||
1129 | mutex_lock(&codec->mutex); | ||
1130 | #ifdef CONFIG_SND_SOC_AC97_BUS | 1130 | #ifdef CONFIG_SND_SOC_AC97_BUS |
1131 | if (ac97) { | 1131 | if (ac97) { |
1132 | ret = soc_ac97_dev_register(codec); | 1132 | ret = soc_ac97_dev_register(codec); |
1133 | if (ret < 0) { | 1133 | if (ret < 0) { |
1134 | printk(KERN_ERR "asoc: AC97 device register failed\n"); | 1134 | printk(KERN_ERR "asoc: AC97 device register failed\n"); |
1135 | snd_card_free(codec->card); | 1135 | snd_card_free(codec->card); |
1136 | mutex_unlock(&codec->mutex); | ||
1136 | goto out; | 1137 | goto out; |
1137 | } | 1138 | } |
1138 | } | 1139 | } |
@@ -1145,8 +1146,10 @@ int snd_soc_register_card(struct snd_soc_device *socdev) | |||
1145 | err = device_create_file(socdev->dev, &dev_attr_codec_reg); | 1146 | err = device_create_file(socdev->dev, &dev_attr_codec_reg); |
1146 | if (err < 0) | 1147 | if (err < 0) |
1147 | printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n"); | 1148 | printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n"); |
1148 | out: | 1149 | |
1149 | mutex_unlock(&codec->mutex); | 1150 | mutex_unlock(&codec->mutex); |
1151 | |||
1152 | out: | ||
1150 | return ret; | 1153 | return ret; |
1151 | } | 1154 | } |
1152 | EXPORT_SYMBOL_GPL(snd_soc_register_card); | 1155 | EXPORT_SYMBOL_GPL(snd_soc_register_card); |