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.15 178/917] USB: iowarrior: fix control-message timeouts
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 79a4479a17b83310deb0b1a2a274fe5be12d2318 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
    timeout and drop the driver-specific one.

    Fixes: 946b960d13c1 ("USB: add driver for iowarrior devices.")
    Cc: stable@vger.kernel.org # 2.6.21
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Link: https://lore.kernel.org/r/20211025115159.4954-3-johan@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/misc/iowarrior.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    --- a/drivers/usb/misc/iowarrior.c
    +++ b/drivers/usb/misc/iowarrior.c
    @@ -99,10 +99,6 @@ struct iowarrior {
    /* globals */
    /*--------------*/

    -/*
    - * USB spec identifies 5 second timeouts.
    - */
    -#define GET_TIMEOUT 5
    #define USB_REQ_GET_REPORT 0x01
    //#if 0
    static int usb_get_report(struct usb_device *dev,
    @@ -114,7 +110,7 @@ static int usb_get_report(struct usb_dev
    USB_DIR_IN | USB_TYPE_CLASS |
    USB_RECIP_INTERFACE, (type << 8) + id,
    inter->desc.bInterfaceNumber, buf, size,
    - GET_TIMEOUT*HZ);
    + USB_CTRL_GET_TIMEOUT);
    }
    //#endif

    @@ -129,7 +125,7 @@ static int usb_set_report(struct usb_int
    USB_TYPE_CLASS | USB_RECIP_INTERFACE,
    (type << 8) + id,
    intf->cur_altsetting->desc.bInterfaceNumber, buf,
    - size, HZ);
    + size, 1000);
    }

    /*---------------------*/

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