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

    commit 16394e998cbb050730536bdf7e89f5a70efbd974 upstream.

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

    Fixes: 66e89522aff7 ("V4L/DVB: IR: add mceusb IR receiver driver")
    Cc: stable@vger.kernel.org # 2.6.36
    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/rc/mceusb.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/media/rc/mceusb.c
    +++ b/drivers/media/rc/mceusb.c
    @@ -1430,7 +1430,7 @@ static void mceusb_gen1_init(struct mceu
    */
    ret = usb_control_msg(ir->usbdev, usb_rcvctrlpipe(ir->usbdev, 0),
    USB_REQ_SET_ADDRESS, USB_TYPE_VENDOR, 0, 0,
    - data, USB_CTRL_MSG_SZ, HZ * 3);
    + data, USB_CTRL_MSG_SZ, 3000);
    dev_dbg(dev, "set address - ret = %d", ret);
    dev_dbg(dev, "set address - data[0] = %d, data[1] = %d",
    data[0], data[1]);
    @@ -1438,20 +1438,20 @@ static void mceusb_gen1_init(struct mceu
    /* set feature: bit rate 38400 bps */
    ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
    USB_REQ_SET_FEATURE, USB_TYPE_VENDOR,
    - 0xc04e, 0x0000, NULL, 0, HZ * 3);
    + 0xc04e, 0x0000, NULL, 0, 3000);

    dev_dbg(dev, "set feature - ret = %d", ret);

    /* bRequest 4: set char length to 8 bits */
    ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
    4, USB_TYPE_VENDOR,
    - 0x0808, 0x0000, NULL, 0, HZ * 3);
    + 0x0808, 0x0000, NULL, 0, 3000);
    dev_dbg(dev, "set char length - retB = %d", ret);

    /* bRequest 2: set handshaking to use DTR/DSR */
    ret = usb_control_msg(ir->usbdev, usb_sndctrlpipe(ir->usbdev, 0),
    2, USB_TYPE_VENDOR,
    - 0x0000, 0x0100, NULL, 0, HZ * 3);
    + 0x0000, 0x0100, NULL, 0, 3000);
    dev_dbg(dev, "set handshake - retC = %d", ret);

    /* device resume */

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