ASoC: Power speakers and headphones simultaneously

Speaker and headphone outputs do not need to be handled separately
since they can't be part of the same path.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 8997fb34dddd96223a1bb4555fb3dacda1db09ff..88461310dc967d8df8bea62544b0eb8d7e488689 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -64,15 +64,15 @@ static int dapm_up_seq[] = {
        [snd_soc_dapm_pga] = 7,
        [snd_soc_dapm_adc] = 8,
        [snd_soc_dapm_hp] = 9,
-       [snd_soc_dapm_spk] = 10,
-       [snd_soc_dapm_post] = 11,
+       [snd_soc_dapm_spk] = 9,
+       [snd_soc_dapm_post] = 10,
 };
 
 static int dapm_down_seq[] = {
        [snd_soc_dapm_pre] = 0,
        [snd_soc_dapm_adc] = 1,
        [snd_soc_dapm_hp] = 2,
-       [snd_soc_dapm_spk] = 3,
+       [snd_soc_dapm_spk] = 2,
        [snd_soc_dapm_pga] = 4,
        [snd_soc_dapm_mixer_named_ctl] = 5,
        [snd_soc_dapm_mixer] = 5,