diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 16:26:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-17 16:26:59 +0100 |
| commit | 1ca04065c3569beb42b9376952df8c96f430f753 (patch) | |
| tree | 615b39ac205ae987b46aa363eecc4a1f27827990 /sound/soc/soc-dapm.c | |
| parent | b14b76a56e49946488637ee68926c5180c39fdb1 (diff) | |
| download | kernel-crypto-1ca04065c3569beb42b9376952df8c96f430f753.tar.gz kernel-crypto-1ca04065c3569beb42b9376952df8c96f430f753.tar.xz kernel-crypto-1ca04065c3569beb42b9376952df8c96f430f753.zip | |
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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 8997fb34ddd..88461310dc9 100644 --- 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, |