Commit 1ba7a7c6 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Add exception for volume-knob in snd_hda_get_connections()

Volume-knob widgets may have connections even if they have no CONN_LIST
cap bit.  Allow the query exceptionally in snd_hda_get_connections().
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a22d543a
...@@ -301,12 +301,15 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, ...@@ -301,12 +301,15 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
unsigned int parm; unsigned int parm;
int i, conn_len, conns; int i, conn_len, conns;
unsigned int shift, num_elems, mask; unsigned int shift, num_elems, mask;
unsigned int wcaps;
hda_nid_t prev_nid; hda_nid_t prev_nid;
if (snd_BUG_ON(!conn_list || max_conns <= 0)) if (snd_BUG_ON(!conn_list || max_conns <= 0))
return -EINVAL; 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: " snd_printk(KERN_WARNING "hda_codec: "
"connection list not available for 0x%x\n", nid); "connection list not available for 0x%x\n", nid);
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment