redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: hda - Terminate the recursive connection search properly

Browse source 
The recursive search of widget connections in snd_hda_get_conn_index()
must be terminated at the pin and the audio-out widgets.  Otherwise
you'll get "too deep connection" warnings unnecessarily.

Reported-by: Francis Moreau <francis.moro@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2011-09-13 10:33:16 +02:00
parent 26b9b559ed
commit 99e14c9d41
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/pci/hda/hda_codec.c
View file

@ -579,9 +579,13 @@ int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
return -1; return -1;
} }
recursive++; recursive++;
for (i = 0; i < nums; i++) for (i = 0; i < nums; i++) {
unsigned int type = get_wcaps_type(get_wcaps(codec, conn[i]));
if (type == AC_WID_PIN || type == AC_WID_AUD_OUT)
continue;
if (snd_hda_get_conn_index(codec, conn[i], nid, recursive) >= 0) if (snd_hda_get_conn_index(codec, conn[i], nid, recursive) >= 0)
return i; return i;
}
return -1; return -1;
} }
EXPORT_SYMBOL_HDA(snd_hda_get_conn_index); EXPORT_SYMBOL_HDA(snd_hda_get_conn_index);