iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: iowarrior: fix control-message timeouts

Browse Source 
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>
This commit is contained in:
Johan Hovold 2021-10-25 13:51:59 +02:00 committed by Greg Kroah-Hartman
parent ebcf652dbb
commit 79a4479a17
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/misc/iowarrior.c
View File

@ -99,10 +99,6 @@ struct iowarrior {
/* globals */ /* globals */
/*--------------*/ /*--------------*/
/*
* USB spec identifies 5 second timeouts.
*/
#define GET_TIMEOUT 5
#define USB_REQ_GET_REPORT 0x01 #define USB_REQ_GET_REPORT 0x01
//#if 0 //#if 0
static int usb_get_report(struct usb_device *dev, static int usb_get_report(struct usb_device *dev,
@ -114,7 +110,7 @@ static int usb_get_report(struct usb_device *dev,
USB_DIR_IN | USB_TYPE_CLASS | USB_DIR_IN | USB_TYPE_CLASS |
USB_RECIP_INTERFACE, (type << 8) + id, USB_RECIP_INTERFACE, (type << 8) + id,
inter->desc.bInterfaceNumber, buf, size, inter->desc.bInterfaceNumber, buf, size,
GET_TIMEOUT*HZ); USB_CTRL_GET_TIMEOUT);
} }
//#endif //#endif
@ -129,7 +125,7 @@ static int usb_set_report(struct usb_interface *intf, unsigned char type,
USB_TYPE_CLASS | USB_RECIP_INTERFACE, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
(type << 8) + id, (type << 8) + id,
intf->cur_altsetting->desc.bInterfaceNumber, buf, intf->cur_altsetting->desc.bInterfaceNumber, buf,
size, HZ); size, 1000);
} }
/*---------------------*/ /*---------------------*/