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

    commit 6aa6e70cdb5b863a57bad61310bf89b6617a5d2d upstream.

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

    Fixes: 9cb2173e6ea8 ("[media] media: Add stk1160 new driver (easycap replacement)")
    Cc: stable@vger.kernel.org # 3.7
    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/stk1160/stk1160-core.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/media/usb/stk1160/stk1160-core.c
    +++ b/drivers/media/usb/stk1160/stk1160-core.c
    @@ -65,7 +65,7 @@ int stk1160_read_reg(struct stk1160 *dev
    return -ENOMEM;
    ret = usb_control_msg(dev->udev, pipe, 0x00,
    USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
    - 0x00, reg, buf, sizeof(u8), HZ);
    + 0x00, reg, buf, sizeof(u8), 1000);
    if (ret < 0) {
    stk1160_err("read failed on reg 0x%x (%d)\n",
    reg, ret);
    @@ -85,7 +85,7 @@ int stk1160_write_reg(struct stk1160 *de

    ret = usb_control_msg(dev->udev, pipe, 0x01,
    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
    - value, reg, NULL, 0, HZ);
    + value, reg, NULL, 0, 1000);
    if (ret < 0) {
    stk1160_err("write failed on reg 0x%x (%d)\n",
    reg, ret);

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