summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLiam Girdwood2012-03-07 11:38:25 +0100
committerMark Brown2012-04-01 12:28:21 +0200
commit01b9d99a1f45befa604543ead29f44fdb0878844 (patch)
treee71ae8fc98724700968b18d6756091fb3f54cf3e /sound/soc/soc-core.c
parentASoC: ak4641: Push GPIO allocation out into the I2C probe (diff)
downloadkernel-qcow2-linux-01b9d99a1f45befa604543ead29f44fdb0878844.tar.gz
kernel-qcow2-linux-01b9d99a1f45befa604543ead29f44fdb0878844.tar.xz
kernel-qcow2-linux-01b9d99a1f45befa604543ead29f44fdb0878844.zip
ASoC: core: Add card mutex locking subclasses
This is the first part of a change that is intended to improve ASoC locking protection for DAPM and PCM operations. This part of the series adds a mutex class for the soc_card mutex. The SND_SOC_CARD_CLASS_INIT class is used for card initialisation only whilst the SND_SOC_CARD_CLASS_PCM class is used for the forth coming Dynamic PCM operations. The new mutex classes are required otherwise we will see a false positive mutex deadlock warning between the card initialisation and the PCM operations (something that would never deadlock in real life). Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a4deebc0801a..a6da20a72d43 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1416,7 +1416,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
struct snd_soc_dai_link *dai_link;
int ret, i, order;
- mutex_lock(&card->mutex);
+ mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT);
if (card->instantiated) {
mutex_unlock(&card->mutex);