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>

diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 8ad43bb32eb05993cd2c60719fc4eca9d8fb431d..16f1a57da08a597bfd1a12da04f0b3b826bb371d 100644 (file)
--- 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,
 
        case SND_SOC_DAPM_PRE_PMD:
                snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,
-                                   WM8993_HPOUT1L_DLY |
-                                   WM8993_HPOUT1R_DLY |
+                                   WM8993_HPOUT1L_OUTP |
+                                   WM8993_HPOUT1R_OUTP |
                                    WM8993_HPOUT1L_RMV_SHORT |
                                    WM8993_HPOUT1R_RMV_SHORT, 0);
 
                snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,
-                                   WM8993_HPOUT1L_OUTP |
-                                   WM8993_HPOUT1R_OUTP, 0);
+                                   WM8993_HPOUT1L_DLY |
+                                   WM8993_HPOUT1R_DLY, 0);
 
                snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,
                                    WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,