aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-10 11:13:11 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-11 09:18:41 -0400
commit6adb26bd03f6056357298bc29d5c6acdea2b216a (patch)
tree3a2a27639fee8d2a2871f8033b696082e01a2687 /sound/soc
parent3254d2850075c88083d870b3ee5e1ce0922cd3d9 (diff)
ASoC: Reorder power down sequence for WM hubs devices
Disable the output stage prior to the delay stage rather than the other way around. Fixes merge issue with previous headphone output path corrections. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm_hubs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 8ad43bb32eb0..16f1a57da08a 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -401,14 +401,14 @@ static int hp_event(struct snd_soc_dapm_widget *w,
401 401
402 case SND_SOC_DAPM_PRE_PMD: 402 case SND_SOC_DAPM_PRE_PMD:
403 snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, 403 snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,
404 WM8993_HPOUT1L_DLY | 404 WM8993_HPOUT1L_OUTP |
405 WM8993_HPOUT1R_DLY | 405 WM8993_HPOUT1R_OUTP |
406 WM8993_HPOUT1L_RMV_SHORT | 406 WM8993_HPOUT1L_RMV_SHORT |
407 WM8993_HPOUT1R_RMV_SHORT, 0); 407 WM8993_HPOUT1R_RMV_SHORT, 0);
408 408
409 snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, 409 snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,
410 WM8993_HPOUT1L_OUTP | 410 WM8993_HPOUT1L_DLY |
411 WM8993_HPOUT1R_OUTP, 0); 411 WM8993_HPOUT1R_DLY, 0);
412 412
413 snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, 413 snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,
414 WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA, 414 WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,