lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 200/849] most: fix control-message timeouts
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 63b3e810eff65fb8587fcb26fa0b56802be12dcf upstream.

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

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

    Fixes: 97a6f772f36b ("drivers: most: add USB adapter driver")
    Cc: stable@vger.kernel.org # 5.9
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Link: https://lore.kernel.org/r/20211025115811.5410-1-johan@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/most/most_usb.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/most/most_usb.c
    +++ b/drivers/most/most_usb.c
    @@ -149,7 +149,8 @@ static inline int drci_rd_reg(struct usb
    retval = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
    DRCI_READ_REQ, req_type,
    0x0000,
    - reg, dma_buf, sizeof(*dma_buf), 5 * HZ);
    + reg, dma_buf, sizeof(*dma_buf),
    + USB_CTRL_GET_TIMEOUT);
    *buf = le16_to_cpu(*dma_buf);
    kfree(dma_buf);

    @@ -176,7 +177,7 @@ static inline int drci_wr_reg(struct usb
    reg,
    NULL,
    0,
    - 5 * HZ);
    + USB_CTRL_SET_TIMEOUT);
    }

    static inline int start_sync_ep(struct usb_device *usb_dev, u16 ep)

    \
     
     \ /
      Last update: 2021-11-16 03:11    [W:4.026 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site