From 855a9920fe4eef52ef6b1c17a7817f6cd42cf9f2 Mon Sep 17 00:00:00 2001 From: Matthew Ranostay Date: Fri, 29 Feb 2008 12:07:43 +0100 Subject: [PATCH] --- yaml --- r: 92099 b: refs/heads/master c: bce6c2b5b4dbe8cd97c48c633b62adeb535954ad h: refs/heads/master i: 92097: 36a18af6f55586620cb6c18fac728b335cc9ca7e 92095: fbed604c12d85daf44bf2c41c6eb70d0a19fca6f v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1793b30f514e..9d485611f43a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c9a3203ff9863fbe798030928f496347c2ed3bd +refs/heads/master: bce6c2b5b4dbe8cd97c48c633b62adeb535954ad diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index 47d3536a6576..9b242a263637 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -3016,12 +3016,16 @@ static int stac92xx_init(struct hda_codec *codec) ? STAC_HP_EVENT : STAC_PWR_EVENT; int pinctl = snd_hda_codec_read(codec, spec->pwr_nids[i], 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); + int def_conf = snd_hda_codec_read(codec, spec->pwr_nids[i], + 0, AC_VERB_GET_CONFIG_DEFAULT, 0); /* outputs are only ports capable of power management * any attempts on powering down a input port cause the * referenced VREF to act quirky. */ if (pinctl & AC_PINCTL_IN_EN) continue; + if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) + continue; enable_pin_detect(codec, spec->pwr_nids[i], event | i); codec->patch_ops.unsol_event(codec, (event | i) << 26); }