aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-20 21:04:34 -0700
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:51:26 -0800
commit5a3403701b8c89861ea93886943dbec89e723da7 (patch)
tree6dff630e14af7adcab242e487cc144d2aee68fcc /sound
parentc54363c80b2b84a92bb1954017c2177df1343d06 (diff)
downloadkernel_samsung_crespo-5a3403701b8c89861ea93886943dbec89e723da7.zip
kernel_samsung_crespo-5a3403701b8c89861ea93886943dbec89e723da7.tar.gz
kernel_samsung_crespo-5a3403701b8c89861ea93886943dbec89e723da7.tar.bz2
ASoC: Don't specify enable bits for speaker+headphone DC servo on herring
Change-Id: Ibf474a43900b8f83716116a186e1a750d7c9ec29 Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994_herring.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994_herring.c b/sound/soc/codecs/wm8994_herring.c
index f8c3d9a..68dcf18 100644
--- a/sound/soc/codecs/wm8994_herring.c
+++ b/sound/soc/codecs/wm8994_herring.c
@@ -1721,8 +1721,7 @@ void wm8994_set_playback_speaker_headset(struct snd_soc_codec *codec)
wm8994->dc_servo[DCS_SPK_HP] = ncompensationresult;
wait_for_dc_servo(codec,
- WM8994_DCS_TRIG_DAC_WR_1 | WM8994_DCS_TRIG_DAC_WR_0 |
- WM8994_DCS_ENA_CHAN_1 | WM8994_DCS_ENA_CHAN_0);
+ WM8994_DCS_TRIG_DAC_WR_1 | WM8994_DCS_TRIG_DAC_WR_0);
val = wm8994_read(codec, WM8994_ANALOGUE_HP_1);
val &= ~(WM8994_HPOUT1R_DLY_MASK | WM8994_HPOUT1R_OUTP_MASK |