diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:44:18 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:44:18 -0700 |
| commit | 067daf59e3921c3093ab56cfd46a6edcb13a94c3 (patch) | |
| tree | 5ea6983c9395e4794b9e53ccaeec68cb5b6b06e9 /sound | |
| parent | 565e03c393854495e814342eb3138e21a3de2604 (diff) | |
| parent | f1c84a5cb52ee2915457b481c756fcc1dfe6a471 (diff) | |
| download | kernel_samsung_tuna-067daf59e3921c3093ab56cfd46a6edcb13a94c3.zip kernel_samsung_tuna-067daf59e3921c3093ab56cfd46a6edcb13a94c3.tar.gz kernel_samsung_tuna-067daf59e3921c3093ab56cfd46a6edcb13a94c3.tar.bz2 | |
Merge commit 'v3.0.30' into linux-omap-3.0
Conflicts:
drivers/usb/musb/omap2430.c
Change-Id: I9c5eb1855dae169177ba14dde3d39a2cffbfbd0f
Signed-off-by: Todd Poynor <toddpoynor@google.com>
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); |