lkml.org 
[lkml]   [2021]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 08/34] usb: webcam: Invalid size of Processing Unit Descriptor
    Date
    From: Pawel Laszczak <pawell@cadence.com>

    [ Upstream commit 6a154ec9ef6762c774cd2b50215c7a8f0f08a862 ]

    According with USB Device Class Definition for Video Device the
    Processing Unit Descriptor bLength should be 12 (10 + bmControlSize),
    but it has 11.

    Invalid length caused that Processing Unit Descriptor Test Video form
    CV tool failed. To fix this issue patch adds bmVideoStandards into
    uvc_processing_unit_descriptor structure.

    The bmVideoStandards field was added in UVC 1.1 and it wasn't part of
    UVC 1.0a.

    Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Pawel Laszczak <pawell@cadence.com>
    Reviewed-by: Peter Chen <peter.chen@kernel.org>
    Link: https://lore.kernel.org/r/20210315071748.29706-1-pawell@gli-login.cadence.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/gadget/function/f_uvc.c | 1 +
    drivers/usb/gadget/legacy/webcam.c | 1 +
    include/uapi/linux/usb/video.h | 3 ++-
    3 files changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
    index 79ecdbb936c1..c03b67aab1a8 100644
    --- a/drivers/usb/gadget/function/f_uvc.c
    +++ b/drivers/usb/gadget/function/f_uvc.c
    @@ -822,6 +822,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
    pd->bmControls[0] = 1;
    pd->bmControls[1] = 0;
    pd->iProcessing = 0;
    + pd->bmVideoStandards = 0;

    od = &opts->uvc_output_terminal;
    od->bLength = UVC_DT_OUTPUT_TERMINAL_SIZE;
    diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
    index a9f8eb8e1c76..2c9eab2b863d 100644
    --- a/drivers/usb/gadget/legacy/webcam.c
    +++ b/drivers/usb/gadget/legacy/webcam.c
    @@ -125,6 +125,7 @@ static const struct uvc_processing_unit_descriptor uvc_processing = {
    .bmControls[0] = 1,
    .bmControls[1] = 0,
    .iProcessing = 0,
    + .bmVideoStandards = 0,
    };

    static const struct uvc_output_terminal_descriptor uvc_output_terminal = {
    diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h
    index d854cb19c42c..bfdae12cdacf 100644
    --- a/include/uapi/linux/usb/video.h
    +++ b/include/uapi/linux/usb/video.h
    @@ -302,9 +302,10 @@ struct uvc_processing_unit_descriptor {
    __u8 bControlSize;
    __u8 bmControls[2];
    __u8 iProcessing;
    + __u8 bmVideoStandards;
    } __attribute__((__packed__));

    -#define UVC_DT_PROCESSING_UNIT_SIZE(n) (9+(n))
    +#define UVC_DT_PROCESSING_UNIT_SIZE(n) (10+(n))

    /* 3.7.2.6. Extension Unit Descriptor */
    struct uvc_extension_unit_descriptor {
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-05-02 16:06    [W:3.051 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site