diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-30 10:11:55 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-30 10:11:55 -0700 |
| commit | 8723b795aaa0c5f0b9db2099af575f5e089a63f1 (patch) | |
| tree | 6df60b05e407bf8e94e9e588e57aaaf8f7a42403 /sound | |
| parent | 298402a3858e17e6a78acafa1dcd490167dd9f74 (diff) | |
| parent | 268ff14525edba31da29a12a9dd693cdd6a7872e (diff) | |
| download | linux-stable-8723b795aaa0c5f0b9db2099af575f5e089a63f1.tar.gz linux-stable-8723b795aaa0c5f0b9db2099af575f5e089a63f1.tar.bz2 linux-stable-8723b795aaa0c5f0b9db2099af575f5e089a63f1.zip | |
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
Diffstat (limited to 'sound')
| -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, |