Commit 64752a95 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Add missing proc text entry for BESPOKEN type 



Recently we've added a new usb_mixer element type, USB_MIXER_BESPOKEN,
but it wasn't added in the table in snd_usb_mixer_dump_cval().  This
is no big problem since each bespoken type should have its own dump
method, but it still isn't disallowed to use the standard one, so we
should cover it as well.  Along with it, define the table with the
explicit array initializer for avoiding other pitfalls.

Fixes: 785b6f29 ("ALSA: usb-audio: scarlett2: Fix wrong resume call")
Reported-by: default avatarPavel Machek <pavel@denx.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210714084836.1977-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2e283256

sound/usb/mixer.c

+9 −1
Original line number Diff line number Diff line
@@ -3295,7 +3295,15 @@ static void snd_usb_mixer_dump_cval(struct snd_info_buffer *buffer, 
{

	struct usb_mixer_elem_info *cval = mixer_elem_list_to_info(list);

	static const char * const val_types[] = {

		"BOOLEAN", "INV_BOOLEAN", "S8", "U8", "S16", "U16", "S32", "U32",

		[USB_MIXER_BOOLEAN] = "BOOLEAN",

		[USB_MIXER_INV_BOOLEAN] = "INV_BOOLEAN",

		[USB_MIXER_S8] = "S8",

		[USB_MIXER_U8] = "U8",

		[USB_MIXER_S16] = "S16",

		[USB_MIXER_U16] = "U16",

		[USB_MIXER_S32] = "S32",

		[USB_MIXER_U32] = "U32",

		[USB_MIXER_BESPOKEN] = "BESPOKEN",

	};

	snd_iprintf(buffer, "    Info: id=%i, control=%i, cmask=0x%x, "

			    "channels=%i, type=\"%s\"\n", cval->head.id,