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.15 045/846] media: em28xx: fix control-message timeouts
    Date
    From: Johan Hovold <johan@kernel.org>

    commit d9b7e8df3aa9b8c10708aab60e72e79ac08237e4 upstream.

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

    Fixes: a6c2ba283565 ("[PATCH] v4l: 716: support for em28xx board family")
    Cc: stable@vger.kernel.org # 2.6.16
    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/em28xx/em28xx-core.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/media/usb/em28xx/em28xx-core.c
    +++ b/drivers/media/usb/em28xx/em28xx-core.c
    @@ -89,7 +89,7 @@ int em28xx_read_reg_req_len(struct em28x
    mutex_lock(&dev->ctrl_urb_lock);
    ret = usb_control_msg(udev, pipe, req,
    USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
    - 0x0000, reg, dev->urb_buf, len, HZ);
    + 0x0000, reg, dev->urb_buf, len, 1000);
    if (ret < 0) {
    em28xx_regdbg("(pipe 0x%08x): IN: %02x %02x %02x %02x %02x %02x %02x %02x failed with error %i\n",
    pipe,
    @@ -158,7 +158,7 @@ int em28xx_write_regs_req(struct em28xx
    memcpy(dev->urb_buf, buf, len);
    ret = usb_control_msg(udev, pipe, req,
    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
    - 0x0000, reg, dev->urb_buf, len, HZ);
    + 0x0000, reg, dev->urb_buf, len, 1000);
    mutex_unlock(&dev->ctrl_urb_lock);

    if (ret < 0) {

    \
     
     \ /
      Last update: 2022-01-24 23:10    [W:4.426 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site