summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/poodle.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-06 11:35:44 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-06 11:35:44 -0400
commit989db2005c328300239da4df4d80b057f8509d3b (patch)
tree1f6c9528148416b0074c72c983503098ebcbcc27 /sound/soc/pxa/poodle.c
parentc046fd4dd613b22b35379665a8f7656d17bde0b3 (diff)
parent197ebd4053c42351e3737d83aebb33ed97ed2dd8 (diff)
downloadlinux-stable-989db2005c328300239da4df4d80b057f8509d3b.tar.gz
linux-stable-989db2005c328300239da4df4d80b057f8509d3b.tar.bz2
linux-stable-989db2005c328300239da4df4d80b057f8509d3b.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/pxa/poodle.c')
-rw-r--r--sound/soc/pxa/poodle.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 7353ee5034fe..f45ea408852b 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -79,8 +79,13 @@ static int poodle_startup(struct snd_pcm_substream *substream)
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec *codec = rtd->codec;
+ mutex_lock(&codec->mutex);
+
/* check the jack status at stream startup */
poodle_ext_control(codec);
+
+ mutex_unlock(&codec->mutex);
+
return 0;
}