diff options
author | JP Abgrall <jpa@google.com> | 2012-05-08 16:49:25 -0700 |
---|---|---|
committer | JP Abgrall <jpa@google.com> | 2012-05-08 16:49:25 -0700 |
commit | 36c97064196c4549f7f5353fdce970d62b4795f9 (patch) | |
tree | ac39335466302c267a5485232da7c1df13e2a76b /sound | |
parent | 11e410cc6d1483328839cd3df8b554299e86aede (diff) | |
parent | 52f91d889a2c2a0f9e0b5e97fa7be8b584834016 (diff) | |
download | kernel_samsung_aries-36c97064196c4549f7f5353fdce970d62b4795f9.zip kernel_samsung_aries-36c97064196c4549f7f5353fdce970d62b4795f9.tar.gz kernel_samsung_aries-36c97064196c4549f7f5353fdce970d62b4795f9.tar.bz2 |
Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown
* common/android-3.0: (49 commits)
Linux 3.0.31
hfsplus: Fix potential buffer overflows
sched: Fix nohz load accounting -- again!
wl1251: fix crash on remove due to leftover work item
wl1251: fix crash on remove due to premature kfree
rtlwifi: Fix oops on unload
mac80211: fix AP mode EAP tx for VLAN stations
ipw2200: Fix race condition in the command completion acknowledge
i2c: pnx: Disable clk in suspend
libata: skip old error history when counting probe trials
hwmon: (coretemp) fix oops on cpu unplug
hwmon: (coretemp) Increase CPU core limit
efivars: Improve variable validation
efi: Validate UEFI boot variables
efivars: fix warnings when CONFIG_PSTORE=n
efivars: String functions
efi: Add new variable attributes
SCSI: libsas: fix false positive 'device attached' conditions
SCSI: libsas: fix sas_find_bcast_phy() in the presence of 'vacant' phys
ARM: 7403/1: tls: remove covert channel via TPIDRURW
...
Diffstat (limited to 'sound')
-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 058c0a8..d5ec206 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, |