summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-12 17:29:36 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-12 19:36:52 +0100
commit7e1f7c8a6e517900cd84da1b8ae020f08f286c3b (patch)
treefa337d2b8cb9fc50ced59af925179959000ad41c /sound/soc/soc-dapm.c
parent8abe05c6eb358967f16bce8a02c88d57c82cfbd6 (diff)
downloadlinux-7e1f7c8a6e517900cd84da1b8ae020f08f286c3b.tar.gz
linux-7e1f7c8a6e517900cd84da1b8ae020f08f286c3b.tar.bz2
linux-7e1f7c8a6e517900cd84da1b8ae020f08f286c3b.zip
ASoC: dapm: Ensure power gets managed for line widgets
Line widgets had not been included in either the power up or power down sequences so if a widget had an event associated with it that event would never be run. Fix this minimally by adding them to the sequences, we should probably be doing away with the specific widget types as they all have the same priority anyway. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 6241490fff30..dc7dbfe61cd0 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -67,6 +67,7 @@ static int dapm_up_seq[] = {
[snd_soc_dapm_out_drv] = 10,
[snd_soc_dapm_hp] = 10,
[snd_soc_dapm_spk] = 10,
+ [snd_soc_dapm_line] = 10,
[snd_soc_dapm_post] = 11,
};
@@ -75,6 +76,7 @@ static int dapm_down_seq[] = {
[snd_soc_dapm_adc] = 1,
[snd_soc_dapm_hp] = 2,
[snd_soc_dapm_spk] = 2,
+ [snd_soc_dapm_line] = 2,
[snd_soc_dapm_out_drv] = 2,
[snd_soc_dapm_pga] = 4,
[snd_soc_dapm_mixer_named_ctl] = 5,