From 6eaa13cb64e35f49ff96be291b455240121db6e9 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 29 Mar 2010 15:24:40 +0100
Subject: [PATCH] --- yaml --- r: 189591 b: refs/heads/master c:
 3fa49e3ad9ac20b15edfb0c51bbad36e45a84b17 h: refs/heads/master i:   189589:
 b0fc521da31bf6e45a72425cef424d84055c5299   189587:
 6b1092fd642554152e79c01f2188443ff9af2860   189583:
 2279397408957c5836a4647e25b185b2f4198a86 v: v3

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

diff --git a/[refs] b/[refs]
index f178e085b0f7..703e5ab15c8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5442a75deee293d10c2ab8f4a77013973c4c9e0
+refs/heads/master: 3fa49e3ad9ac20b15edfb0c51bbad36e45a84b17
diff --git a/trunk/sound/soc/codecs/wm_hubs.c b/trunk/sound/soc/codecs/wm_hubs.c
index 486bdd21a98a..3729a12b151f 100644
--- a/trunk/sound/soc/codecs/wm_hubs.c
+++ b/trunk/sound/soc/codecs/wm_hubs.c
@@ -113,13 +113,15 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
 		/* HPOUT1L */
 		reg = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1) &
 			WM8993_DCS_INTEG_CHAN_0_MASK;;
-		reg += hubs->dcs_codes;
+		if (reg + hubs->dcs_codes > 0 && reg + hubs->dcs_codes < 0xff)
+			reg += hubs->dcs_codes;
 		dcs_cfg = reg << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
 
 		/* HPOUT1R */
 		reg = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) &
 			WM8993_DCS_INTEG_CHAN_1_MASK;
-		reg += hubs->dcs_codes;
+		if (reg + hubs->dcs_codes > 0 && reg + hubs->dcs_codes < 0xff)
+			reg += hubs->dcs_codes;
 		dcs_cfg |= reg;
 
 		/* Do it */