ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs (3a90274d) · Commits · 戴 / test

When an invalid NID is given, get_wcaps() returns zero as the error, but get_wcaps_type() takes it as the normal value and returns a bogus AC_WID_AUD_OUT value. This confuses the parser. With this patch, get_wcaps_type() returns -1 when value 0 is given, i.e. an invalid NID is passed to get_wcaps(). Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=740118 Cc: <stable@kernel.org> Signed-off-by:

Takashi Iwai <tiwai@suse.de>

sound/pci/hda/hda_local.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -488,7 +488,12 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
		}

		/* get the widget type from widget capability bits */
		#define get_wcaps_type(wcaps) (((wcaps) & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT)
		static inline int get_wcaps_type(unsigned int wcaps)
		{
		if (!wcaps)
		return -1; /* invalid type */
		return (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
		}

		static inline unsigned int get_wcaps_channels(u32 wcaps)
		{

sound/pci/hda/hda_proc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ static const char *get_wid_type_name(unsigned int wid_value)
		[AC_WID_BEEP] = "Beep Generator Widget",
		[AC_WID_VENDOR] = "Vendor Defined Widget",
		};
		if (wid_value == -1)
		return "UNKNOWN Widget";
		wid_value &= 0xf;
		if (names[wid_value])
		return names[wid_value];

Admin message