diff options
| author | Lars-Peter Clausen | 2013-06-14 13:16:50 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-06-14 13:35:23 +0200 |
| commit | efc77e36ae6ff4394a0232a4f87bded0bd555d6b (patch) | |
| tree | 80a9467215cffa1ca74b2d8b81918f38ff768a34 /sound/soc/soc-dapm.c | |
| parent | Linux 3.10-rc5 (diff) | |
| download | kernel-qcow2-linux-efc77e36ae6ff4394a0232a4f87bded0bd555d6b.tar.gz kernel-qcow2-linux-efc77e36ae6ff4394a0232a4f87bded0bd555d6b.tar.xz kernel-qcow2-linux-efc77e36ae6ff4394a0232a4f87bded0bd555d6b.zip | |
ASoC: dapm: Add snd_soc_dapm_switch to the power up/down sequence table
The power up/down sequence order for DAPM switch widgets is not explicitly
initialized, causing them to be run always as the first widget type for both
power up and down. Move it to the same position in the sequence as other mixer
widget types.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a80c883bb8be..2324f3cfa0d0 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -63,6 +63,7 @@ static int dapm_up_seq[] = { [snd_soc_dapm_virt_mux] = 5, [snd_soc_dapm_value_mux] = 5, [snd_soc_dapm_dac] = 6, + [snd_soc_dapm_switch] = 7, [snd_soc_dapm_mixer] = 7, [snd_soc_dapm_mixer_named_ctl] = 7, [snd_soc_dapm_pga] = 8, @@ -82,6 +83,7 @@ static int dapm_down_seq[] = { [snd_soc_dapm_line] = 2, [snd_soc_dapm_out_drv] = 2, [snd_soc_dapm_pga] = 4, + [snd_soc_dapm_switch] = 5, [snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer] = 5, [snd_soc_dapm_dac] = 6, |