commit 989db2005c328300239da4df4d80b057f8509d3b
author Mark Brown <broonie@opensource.wolfsonmicro.com> Sat Nov 06 11:35:44 2010 -0400
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Sat Nov 06 11:35:44 2010 -0400
tree 1f6c9528148416b0074c72c983503098ebcbcc27
parent c046fd4dd613b22b35379665a8f7656d17bde0b3
parent 197ebd4053c42351e3737d83aebb33ed97ed2dd8

Merge branch 'for-2.6.37' into for-2.6.38

sound/soc/codecs/wm8776.c

diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index 96474a4..e09ed65 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -34,7 +34,6 @@
 /* codec private data */
 struct wm8776_priv {
 	enum snd_soc_control_type control_type;
-	u16 reg_cache[WM8776_CACHEREGNUM];
 	int sysclk[2];
 };
 

sound/soc/pxa/corgi.c

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 810633c..85956ff 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -102,8 +102,13 @@
 	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 */
 	corgi_ext_control(codec);
+
+	mutex_unlock(&codec->mutex);
+
 	return 0;
 }
 

sound/soc/pxa/magician.c

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index f1acdc5..98cb990 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -74,9 +74,13 @@
 	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 */
 	magician_ext_control(codec);
 
+	mutex_unlock(&codec->mutex);
+
 	return 0;
 }
 

sound/soc/pxa/poodle.c

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 7353ee5..f45ea408 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -79,8 +79,13 @@
 	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;
 }
 

sound/soc/pxa/spitz.c

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 0680b11..7e13440 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -110,8 +110,13 @@
 	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 */
 	spitz_ext_control(codec);
+
+	mutex_unlock(&codec->mutex);
+
 	return 0;
 }
 

sound/soc/pxa/tosa.c

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 0a9bd68..7f81f82 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -83,8 +83,13 @@
 	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 */
 	tosa_ext_control(codec);
+
+	mutex_unlock(&codec->mutex);
+
 	return 0;
 }