diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-15 08:58:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-15 08:58:49 +0200 |
| commit | f153c6af87401fdae3bb2dfbfc6284eb0d537a05 (patch) | |
| tree | c0a8297706f86f949ad4aba194f46f52ab53de21 /sound/pci/hda/patch_sigmatel.c | |
| parent | 7560931fbd0a7cb86b8cb06f363c5e4984f4f7d0 (diff) | |
| parent | b0791dda813c179e539b0fc1ecd3f5f30f2571e2 (diff) | |
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 0669149a92f..3808f37bf15 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4390,9 +4390,9 @@ static int stac92xx_init(struct hda_codec *codec) def_conf = get_defcfg_connect(def_conf); /* skip any ports that don't have jacks since presence * detection is useless */ - if (def_conf != AC_JACK_PORT_COMPLEX) { - if (def_conf != AC_JACK_PORT_NONE) - stac_toggle_power_map(codec, nid, 1); + if (def_conf != AC_JACK_PORT_NONE && + !is_jack_detectable(codec, nid)) { + stac_toggle_power_map(codec, nid, 1); continue; } if (enable_pin_detect(codec, nid, STAC_PWR_EVENT)) { |