diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-26 20:06:01 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-06-26 20:06:01 +0400 |
| commit | b54f8abad63fa409fa637e86d2bebd597342c0f8 (patch) | |
| tree | fe3b52d81d63f57195c18334bcdfa062a9a178bb /sound/pci/hda/patch_sigmatel.c | |
| parent | a75e92442a9b17b24876ca85701a722af32d31a5 (diff) | |
| parent | 6e1c39c6b00d9141a82c231ba7c5e5b1716974b2 (diff) | |
| download | linux-b54f8abad63fa409fa637e86d2bebd597342c0f8.tar.xz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 7db8228f1b88..07675282015a 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4367,7 +4367,7 @@ static int stac92xx_init(struct hda_codec *codec) AC_PINCTL_IN_EN); for (i = 0; i < spec->num_pwrs; i++) { hda_nid_t nid = spec->pwr_nids[i]; - int pinctl, def_conf; + unsigned int pinctl, def_conf; def_conf = snd_hda_codec_get_pincfg(codec, nid); def_conf = get_defcfg_connect(def_conf); @@ -4376,6 +4376,11 @@ static int stac92xx_init(struct hda_codec *codec) stac_toggle_power_map(codec, nid, 0); continue; } + if (def_conf == AC_JACK_PORT_FIXED) { + /* no need for jack detection for fixed pins */ + stac_toggle_power_map(codec, nid, 1); + continue; + } /* power on when no jack detection is available */ /* or when the VREF is used for controlling LED */ if (!spec->hp_detect || |