diff options
| author | JP Abgrall <jpa@google.com> | 2012-05-04 15:03:06 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2012-05-04 15:03:06 -0700 |
| commit | 84b5110abf84dfe8cbcb1434488f259137ac232e (patch) | |
| tree | 77ceac266f22138afee355b00f0b8d075b23d73a /sound | |
| parent | 601b4b2b4a396b69e4524d1c3065d0d80efd0cb5 (diff) | |
| parent | 758aaf52f607604164e93feff93b725d491e44f7 (diff) | |
| download | kernel_samsung_aries-84b5110abf84dfe8cbcb1434488f259137ac232e.zip kernel_samsung_aries-84b5110abf84dfe8cbcb1434488f259137ac232e.tar.gz kernel_samsung_aries-84b5110abf84dfe8cbcb1434488f259137ac232e.tar.bz2 | |
Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown
* common/android-3.0: (135 commits)
net: wireless: bcmdhd: Avoid turning radio UP twice on start
cpufreq: interactive: add boost pulse interface
net: wireless: bcmdhd: Set MMC_PM_KEEP_POWER flag on suspend
net: wireless: bcmdhd: Update to Version 5.90.195.61
net: wireless: bcmdhd: Turn OFF wlan power if interface UP fails
ARM: vfp: only clear vfp state for current cpu in vfp_pm_suspend
arm: vfp: Fix memory corruption on PM suspend
Linux 3.0.30
tcp: fix TCP_MAXSEG for established IPv6 passive sockets
net ax25: Reorder ax25_exit to remove races.
ksz884x: don't copy too much in netdev_set_mac_address()
netns: do not leak net_generic data on failed init
tcp: fix tcp_grow_window() for large incoming frames
dummy: Add ndo_uninit().
net: usb: smsc75xx: fix mtu
net_sched: gred: Fix oops in gred_dump() in WRED mode
net/ethernet: ks8851_mll fix rx frame buffer overflow
net: smsc911x: fix skb handling in receive path
8139cp: set intr mask after its handler is registered
atl1: fix kernel panic in case of DMA errors
...
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 4ad20a6..4cf3266 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -4003,9 +4003,14 @@ static void cx_auto_init_output(struct hda_codec *codec) int i; mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids); - for (i = 0; i < cfg->hp_outs; i++) + for (i = 0; i < cfg->hp_outs; i++) { + unsigned int val = PIN_OUT; + if (snd_hda_query_pin_caps(codec, cfg->hp_pins[i]) & + AC_PINCAP_HP_DRV) + val |= AC_PINCTL_HP_EN; snd_hda_codec_write(codec, cfg->hp_pins[i], 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP); + AC_VERB_SET_PIN_WIDGET_CONTROL, val); + } mute_outputs(codec, cfg->hp_outs, cfg->hp_pins); mute_outputs(codec, cfg->line_outs, cfg->line_out_pins); mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins); |