Commit dca008f3 authored Jan 22, 2008 by Takashi Iwai Committed by Jaroslav Kysela Jan 31, 2008

[ALSA] hda-codec - Don't query widget parameter for invalid NID



Don't query a widget parameter for an invalid NID in get_wcaps() but
rather returns zero (i.e. no attribute).
The read to an non-existing widget may result in a fatal codec
communication error.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

parent 0ef6ce7b

sound/pci/hda/hda_local.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -370,7 +370,7 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
		{
		if (nid < codec->start_nid \|\|
		nid >= codec->start_nid + codec->num_nodes)
		return snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);
		return 0;
		return codec->wcaps[nid - codec->start_nid];
		}