diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-16 12:20:24 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-16 12:20:24 +0200 |
| commit | ffd0e56c606836581da5df742a43ce8015ca7475 (patch) | |
| tree | 6e5c2ab926e8bc7a7ea7ab34551d8fe31d971f84 /sound/pci | |
| parent | d523b0c808a5c5cbde9ac89427d98ee6288f5f2f (diff) | |
| download | linux-3.10-ffd0e56c606836581da5df742a43ce8015ca7475.tar.gz linux-3.10-ffd0e56c606836581da5df742a43ce8015ca7475.tar.bz2 linux-3.10-ffd0e56c606836581da5df742a43ce8015ca7475.zip | |
ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
When the headphone can have no unique DAC, the current code doesn't
check the HP-detection although it should. Put the hp-detection check
before the DAC check to fix this bug.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index ce30b459aee..917bc5d3ac2 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -3076,6 +3076,11 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs, unsigned int wid_caps; for (i = 0; i < num_outs && i < ARRAY_SIZE(chname); i++) { + if (type == AUTO_PIN_HP_OUT && !spec->hp_detect) { + wid_caps = get_wcaps(codec, pins[i]); + if (wid_caps & AC_WCAP_UNSOL_CAP) + spec->hp_detect = 1; + } nid = dac_nids[i]; if (!nid) continue; @@ -3119,11 +3124,6 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs, err = create_controls_idx(codec, name, idx, nid, 3); if (err < 0) return err; - if (type == AUTO_PIN_HP_OUT && !spec->hp_detect) { - wid_caps = get_wcaps(codec, pins[i]); - if (wid_caps & AC_WCAP_UNSOL_CAP) - spec->hp_detect = 1; - } } } return 0; |