diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 10:45:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 10:45:07 +0100 |
| commit | 15d47763b354256053c390a9b7bc9f2b4f197711 (patch) | |
| tree | 6f516e0d3a3d5fb0174d06dfd6db268f4eb5b8ed /sound/pci/hda/patch_sigmatel.c | |
| parent | ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements (diff) | |
| parent | ASoC: omap-mcpdm: Add missing MODULE_ALIAS (diff) | |
| download | linux-dev-15d47763b354256053c390a9b7bc9f2b4f197711.tar.xz linux-dev-15d47763b354256053c390a9b7bc9f2b4f197711.zip | |
Merge branch 'for-3.5' into for-3.6
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 || |