From 39a4e39f1de7faa2228a505574c30e821ac6f0fd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 21 Nov 2012 14:27:37 +0100 Subject: [PATCH] --- yaml --- r: 342603 b: refs/heads/master c: efc2f8de1da8e140331cfdbfdc6e0d596c33fb40 h: refs/heads/master i: 342601: 3c886f7a6b9a19688300c047f21f735558c855a1 342599: f90fdb712e80f55c4c479d5418ef85b41c25ab14 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_hdmi.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0f5b063e3409..d4acb1745583 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0db6063dba4ee02dfda7411ec3aaf8f0fbda0f7 +refs/heads/master: efc2f8de1da8e140331cfdbfdc6e0d596c33fb40 diff --git a/trunk/sound/pci/hda/patch_hdmi.c b/trunk/sound/pci/hda/patch_hdmi.c index 3824699142ee..0fcfa6f406b8 100644 --- a/trunk/sound/pci/hda/patch_hdmi.c +++ b/trunk/sound/pci/hda/patch_hdmi.c @@ -1193,12 +1193,11 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) struct hdmi_spec_per_pin *per_pin; int err; - caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP); + caps = snd_hda_query_pin_caps(codec, pin_nid); if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP))) return 0; - config = snd_hda_codec_read(codec, pin_nid, 0, - AC_VERB_GET_CONFIG_DEFAULT, 0); + config = snd_hda_codec_get_pincfg(codec, pin_nid); if (get_defcfg_connect(config) == AC_JACK_PORT_NONE) return 0; @@ -1272,7 +1271,7 @@ static int hdmi_parse_codec(struct hda_codec *codec) unsigned int caps; unsigned int type; - caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP); + caps = get_wcaps(codec, nid); type = get_wcaps_type(caps); if (!(caps & AC_WCAP_DIGITAL))