| commit | 8723b795aaa0c5f0b9db2099af575f5e089a63f1 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Wed Oct 30 10:11:55 2013 -0700 |
| committer | Mark Brown <broonie@linaro.org> | Wed Oct 30 10:11:55 2013 -0700 |
| tree | 6df60b05e407bf8e94e9e588e57aaaf8f7a42403 | |
| parent | 298402a3858e17e6a78acafa1dcd490167dd9f74 [diff] | |
| parent | 268ff14525edba31da29a12a9dd693cdd6a7872e [diff] |
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 8b50e59..01daf65 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c
@@ -530,6 +530,7 @@ hubs->hp_startup_mode); break; } + break; case SND_SOC_DAPM_PRE_PMD: snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1,