lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0049/1039] media: s2255: fix control-message timeouts
    Date
    From: Johan Hovold <johan@kernel.org>

    commit f71d272ad4e354097020a4e6b1dc6e4b59feb50f upstream.

    USB control-message timeouts are specified in milliseconds and should
    specifically not vary with CONFIG_HZ.

    Use the common control-message timeout define for the five-second
    timeouts.

    Fixes: 38f993ad8b1f ("V4L/DVB (8125): This driver adds support for the Sensoray 2255 devices.")
    Cc: stable@vger.kernel.org # 2.6.27
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/usb/s2255/s2255drv.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/media/usb/s2255/s2255drv.c
    +++ b/drivers/media/usb/s2255/s2255drv.c
    @@ -1882,7 +1882,7 @@ static long s2255_vendor_req(struct s225
    USB_TYPE_VENDOR | USB_RECIP_DEVICE |
    USB_DIR_IN,
    Value, Index, buf,
    - TransferBufferLength, HZ * 5);
    + TransferBufferLength, USB_CTRL_SET_TIMEOUT);

    if (r >= 0)
    memcpy(TransferBuffer, buf, TransferBufferLength);
    @@ -1891,7 +1891,7 @@ static long s2255_vendor_req(struct s225
    r = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
    Request, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
    Value, Index, buf,
    - TransferBufferLength, HZ * 5);
    + TransferBufferLength, USB_CTRL_SET_TIMEOUT);
    }
    kfree(buf);
    return r;

    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:2.719 / U:1.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site