lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 03/43] ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kirill Marinushkin <k.marinushkin@gmail.com>

    commit a6618f4aedb2b60932d766bd82ae7ce866e842aa upstream.

    Currently, the offsets in the UAC2 processing unit descriptor are
    calculated incorrectly. It causes an issue when connecting the device which
    provides such a feature:

    ~~~~
    [84126.724420] usb 1-1.3.1: invalid Processing Unit descriptor (id 18)
    ~~~~

    After this patch is applied, the UAC2 processing unit inits w/o this error.

    Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0")
    Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/uapi/linux/usb/audio.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/uapi/linux/usb/audio.h
    +++ b/include/uapi/linux/usb/audio.h
    @@ -369,7 +369,7 @@ static inline __u8 uac_processing_unit_b
    {
    return (protocol == UAC_VERSION_1) ?
    desc->baSourceID[desc->bNrInPins + 4] :
    - desc->baSourceID[desc->bNrInPins + 6];
    + 2; /* in UAC2, this value is constant */
    }

    static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
    @@ -377,7 +377,7 @@ static inline __u8 *uac_processing_unit_
    {
    return (protocol == UAC_VERSION_1) ?
    &desc->baSourceID[desc->bNrInPins + 5] :
    - &desc->baSourceID[desc->bNrInPins + 7];
    + &desc->baSourceID[desc->bNrInPins + 6];
    }

    static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,

    \
     
     \ /
      Last update: 2018-03-27 20:11    [W:4.266 / U:0.960 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site