lkml.org 
[lkml]   [2022]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.16 097/217] media: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds.
    Date
    From: James Hilliard <james.hilliard1@gmail.com>

    [ Upstream commit c8ed7d2f614cd8b315981d116c7a2fb01829500d ]

    Some uvc devices appear to require the maximum allowed USB timeout
    for GET_CUR/SET_CUR requests.

    So lets just bump the UVC control timeout to 5 seconds which is the
    same as the usb ctrl get/set defaults:
    USB_CTRL_GET_TIMEOUT 5000
    USB_CTRL_SET_TIMEOUT 5000

    It fixes the following runtime warnings:
    Failed to query (GET_CUR) UVC control 11 on unit 2: -110 (exp. 1).
    Failed to query (SET_CUR) UVC control 3 on unit 2: -110 (exp. 2).

    Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/uvc/uvcvideo.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
    index 2e5366143b814..143230b3275b3 100644
    --- a/drivers/media/usb/uvc/uvcvideo.h
    +++ b/drivers/media/usb/uvc/uvcvideo.h
    @@ -189,7 +189,7 @@
    /* Maximum status buffer size in bytes of interrupt URB. */
    #define UVC_MAX_STATUS_SIZE 16

    -#define UVC_CTRL_CONTROL_TIMEOUT 500
    +#define UVC_CTRL_CONTROL_TIMEOUT 5000
    #define UVC_CTRL_STREAMING_TIMEOUT 5000

    /* Maximum allowed number of control mappings per device */
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-18 03:29    [W:4.141 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site