Merge branch 'for-2.6.37' into for-2.6.38

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;
 }