---

yaml --- r: 189591 b: refs/heads/master c: 3fa49e3 h: refs/heads/master i: 189589: b0fc521 189587: 6b1092f 189583: 2279397 v: v3
git-mirror · Apr 5, 2010 · 6eaa13c · 6eaa13c
1 parent f416665
commit 6eaa13c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 */