Merge branch 'for-2.6.39' into for-2.6.40

mariux64 · May 10, 2011 · 0f3c6af · 0f3c6af
2 parents 1209842 + 61bf35b
commit 0f3c6af
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
@@ -699,7 +699,7 @@ SOC_ENUM("DRC Smoothing Threshold", drc_smoothing),
 SOC_SINGLE_TLV("DRC Startup Volume", WM8903_DRC_0, 6, 18, 0, drc_tlv_startup),
 
 SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT,
-		 WM8903_ADC_DIGITAL_VOLUME_RIGHT, 1, 96, 0, digital_tlv),
+		 WM8903_ADC_DIGITAL_VOLUME_RIGHT, 1, 120, 0, digital_tlv),
 SOC_ENUM("ADC Companding Mode", adc_companding),
 SOC_SINGLE("ADC Companding Switch", WM8903_AUDIO_INTERFACE_0, 3, 1, 0),