From bf70f301c7f3dfe43aeb5f32646b0e453efa2302 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 1 Dec 2011 13:49:19 -0700
Subject: [PATCH] --- yaml --- r: 283841 b: refs/heads/master c:
 6f526f0a86dbb22fd2fc5a873f55c9e2341a79c0 h: refs/heads/master i:   283839:
 3ea793093fc8088ccc8db3c7eac1f81dbea62186 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8903.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 84f69edcc608..9f958bee8bbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84b315ee893676e9a9ce8ac42ab5ef44e2af3ee1
+refs/heads/master: 6f526f0a86dbb22fd2fc5a873f55c9e2341a79c0
diff --git a/trunk/sound/soc/codecs/wm8903.c b/trunk/sound/soc/codecs/wm8903.c
index d663c97785d7..60ad8cdc046c 100644
--- a/trunk/sound/soc/codecs/wm8903.c
+++ b/trunk/sound/soc/codecs/wm8903.c
@@ -1936,11 +1936,11 @@ static int wm8903_probe(struct snd_soc_codec *codec)
 		bool mic_gpio = false;
 
 		for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) {
-			if (pdata->gpio_cfg[i] == WM8903_GPIO_NO_CONFIG)
+			if (pdata->gpio_cfg[i] > 0x7fff)
 				continue;
 
 			snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i,
-				      pdata->gpio_cfg[i] & 0xffff);
+				      pdata->gpio_cfg[i] & 0x7fff);
 
 			val = (pdata->gpio_cfg[i] & WM8903_GP1_FN_MASK)
 				>> WM8903_GP1_FN_SHIFT;