From 868d83e0894eed877e155bf43324d96a30d48312 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 23 Feb 2009 09:28:12 +0100 Subject: [PATCH] --- yaml --- r: 133069 b: refs/heads/master c: c17a1abae2f29047a0f57324240b01609489261b h: refs/heads/master i: 133067: 6264c75ed240c423dc07ce6e8e499eeb69b1f52b v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 3 +-- trunk/sound/pci/hda/hda_generic.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4a91491daefd..fc03b8d93a04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1085c4f319f1e43c95718045a235f276cc4b615 +refs/heads/master: c17a1abae2f29047a0f57324240b01609489261b diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 6fa871f66a72..8ec2dfca9a6c 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -3488,8 +3488,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, if (ignore_nids && is_in_nid_list(nid, ignore_nids)) continue; - def_conf = snd_hda_codec_read(codec, nid, 0, - AC_VERB_GET_CONFIG_DEFAULT, 0); + def_conf = snd_hda_codec_get_pincfg(codec, nid); if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE) continue; loc = get_defcfg_location(def_conf); diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index 65745e96dc70..2c81a683e8f8 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -146,7 +146,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid if (node->type == AC_WID_PIN) { node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP); node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); - node->def_cfg = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0); + node->def_cfg = snd_hda_codec_get_pincfg(codec, node->nid); } if (node->wid_caps & AC_WCAP_OUT_AMP) {