diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-04 10:04:13 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-04 10:04:13 +0400 |
commit | b199b0fcde29731710a571cb65460f53fd8e0927 (patch) | |
tree | 250eb9a8cb776c2fc7d7b630cea6ebbc8c9a23f4 /sound/soc | |
parent | 41caa416341528d104294daa95244cc1eeb754ff (diff) | |
parent | 268ff14525edba31da29a12a9dd693cdd6a7872e (diff) | |
download | linux-b199b0fcde29731710a571cb65460f53fd8e0927.tar.xz |
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm_hubs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 8b50e5958de5..01daf655e20b 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -530,6 +530,7 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w, hubs->hp_startup_mode); break; } + break; case SND_SOC_DAPM_PRE_PMD: snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1, |