lkml.org 
[lkml]   [2021]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 148/223] ALSA: usb-audio: Add missing proc text entry for BESPOKEN type
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit 64752a95b702817602d72f109ceaf5ec0780e283 upstream.

    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: 785b6f29a795 ("ALSA: usb-audio: scarlett2: Fix wrong resume call")
    Reported-by: Pavel Machek <pavel@denx.de>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20210714084836.1977-1-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/usb/mixer.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    --- a/sound/usb/mixer.c
    +++ b/sound/usb/mixer.c
    @@ -3295,7 +3295,15 @@ static void snd_usb_mixer_dump_cval(stru
    {
    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,

    \
     
     \ /
      Last update: 2021-07-26 18:44    [W:3.068 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site