From 6ff326eff04ea9836e14f2427236e7e513269dff Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 4 Dec 2009 14:22:03 +0000
Subject: [PATCH] --- yaml --- r: 182777 b: refs/heads/master c:
 dd1b3d53c2e5b9cccec9001fc0b63f6b686a4ac9 h: refs/heads/master i:   182775:
 a7c97a6f254d735be4440bce4771eec31c431048 v: v3

---
 [refs]                     | 2 +-
 trunk/include/sound/soc.h  | 3 +++
 trunk/sound/soc/soc-core.c | 7 ++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 44ab9cc17f69..70e816da27eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a7aaed714bbe3c071000d720f0cce186d1897a4
+refs/heads/master: dd1b3d53c2e5b9cccec9001fc0b63f6b686a4ac9
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 0d7718f9280d..08909ccd235b 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -253,6 +253,9 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
 /* codec register bit access */
 int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
 				unsigned int mask, unsigned int value);
+int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
+			       unsigned short reg, unsigned int mask,
+			       unsigned int value);
 int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
 				unsigned int mask, unsigned int value);
 
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index ef8f28284cb9..8b900a842677 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1427,9 +1427,9 @@ EXPORT_SYMBOL_GPL(snd_soc_update_bits);
  *
  * Returns 1 for change else 0.
  */
-static int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
-				unsigned short reg, unsigned int mask,
-				unsigned int value)
+int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
+			       unsigned short reg, unsigned int mask,
+			       unsigned int value)
 {
 	int change;
 
@@ -1439,6 +1439,7 @@ static int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
 
 	return change;
 }
+EXPORT_SYMBOL_GPL(snd_soc_update_bits_locked);
 
 /**
  * snd_soc_test_bits - test register for change