From 170ce2c589dce3fae565883ef6fb25be4ad9e059 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Jul 2009 12:56:26 +0200 Subject: [PATCH] --- yaml --- r: 157807 b: refs/heads/master c: 1ba7a7c650bd8ee567e25d9b68e9081d131c70f6 h: refs/heads/master i: 157805: d7d10c149437a502a8d360b9c1b1413963480fce 157803: 9bba71284cd5074af837d29330d40a3d62766a9b 157799: 0a32c1baa3af8d4042d7c376f5f09e3175633f02 157791: fd85f1f4965f30c8d87756d1e97cf0d99ad0ac6c v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25f743634364..8b199ab5ac5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a22d543a95e82e5ad0ee1a44aad54fd6b6bf52a8 +refs/heads/master: 1ba7a7c650bd8ee567e25d9b68e9081d131c70f6 diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index b8c656c21feb..3a603cde8cc4 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -301,12 +301,15 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, unsigned int parm; int i, conn_len, conns; unsigned int shift, num_elems, mask; + unsigned int wcaps; hda_nid_t prev_nid; if (snd_BUG_ON(!conn_list || max_conns <= 0)) return -EINVAL; - if ((get_wcaps(codec, nid) & AC_WCAP_CONN_LIST) == 0) { + wcaps = get_wcaps(codec, nid); + if (!(wcaps & AC_WCAP_CONN_LIST) && + get_wcaps_type(wcaps) != AC_WID_VOL_KNB) { snd_printk(KERN_WARNING "hda_codec: " "connection list not available for 0x%x\n", nid); return -EINVAL;