diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-23 16:39:47 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-23 16:39:47 (GMT) |
| commit | cff7873554eedc044029c41a9fd694245d97eff8 (patch) | |
| tree | 453024605141ed884277e40d55f2b7e62b5b919c /sound/soc/soc-dapm.c | |
| parent | 5ac57550f279c3d991ef0b398681bcaca18169f7 (diff) | |
| parent | 1a38336b8611a04f0a624330c1f815421f4bf5f4 (diff) | |
| download | linux-fsl-qoriq-cff7873554eedc044029c41a9fd694245d97eff8.tar.xz | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: updates for 3.4
Slightly larger than normal - the DAPM fix is a "this should always have
worked" type of thing which is very clear and should have no impact on
systems that don't need it. The WM8994 fix is driver specific but
pretty important for that driver.
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 6241490..dc7dbfe 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, |