aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-12-06 16:48:03 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-06 12:53:43 +0000
commit1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7 (patch)
treedc8c2c67c1d36041fed0d792e50b2d04af450c45 /sound/soc/soc-core.c
parentASoC: Fix swap of left and right channels for WM8993/4 speaker boost gain (diff)
downloadlinux-dev-1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7.tar.xz
linux-dev-1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7.zip
ASoC: Hold client_mutex while calling snd_soc_instantiate_cards()
As the comments of snd_soc_instantiate_cards() said, snd_soc_instantiate_cards() must be called with client_mutex. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to '')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 441285ade024..02ae7bea3b50 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3072,7 +3072,9 @@ int snd_soc_register_dais(struct device *dev,
pr_debug("Registered DAI '%s'\n", dai->name);
}
+ mutex_lock(&client_mutex);
snd_soc_instantiate_cards();
+ mutex_unlock(&client_mutex);
return 0;
err: