diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:15:47 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:15:47 -0500 |
| commit | 209b14033652f0509912da97fb4a5c8001e64ec0 (patch) | |
| tree | 4b9f6e00815932c65dacd1e0148fe0538bb2323d /sound/pci/hda/patch_analog.c | |
| parent | 13c989beba166b470b1e6b0fa117148bcbfa3dd1 (diff) | |
| parent | 39c2871eeaeeddcbecee29ec905ec528a057ca52 (diff) | |
Merge branch 'test/hda-pincfg' into topic/hda
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index b16802841468..0253cb93aa7f 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -1047,8 +1047,7 @@ static struct hda_amp_list ad1986a_loopbacks[] = { | |||
| 1047 | 1047 | ||
| 1048 | static int is_jack_available(struct hda_codec *codec, hda_nid_t nid) | 1048 | static int is_jack_available(struct hda_codec *codec, hda_nid_t nid) |
| 1049 | { | 1049 | { |
| 1050 | unsigned int conf = snd_hda_codec_read(codec, nid, 0, | 1050 | unsigned int conf = snd_hda_codec_get_pincfg(codec, nid); |
| 1051 | AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
| 1052 | return get_defcfg_connect(conf) != AC_JACK_PORT_NONE; | 1051 | return get_defcfg_connect(conf) != AC_JACK_PORT_NONE; |
| 1053 | } | 1052 | } |
| 1054 | 1053 | ||