Skip to content

Commit

Permalink
ALSA: hda - Add exception for volume-knob in snd_hda_get_connections()
Browse files Browse the repository at this point in the history
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: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jul 27, 2009
1 parent a22d543 commit 1ba7a7c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1ba7a7c

Please sign in to comment.