Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a643c0f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: iowarrior: fix control-message timeouts 



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: 946b960d ("USB: add driver for iowarrior devices.")
Cc: stable@vger.kernel.org      # 2.6.21
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20211025115159.4954-3-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32858116

drivers/usb/misc/iowarrior.c

+2 −6
Original line number Diff line number Diff line
@@ -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_device *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_interface *intf, unsigned char type, 
			       USB_TYPE_CLASS | USB_RECIP_INTERFACE,

			       (type << 8) + id,

			       intf->cur_altsetting->desc.bInterfaceNumber, buf,

			       size, HZ);

			       size, 1000);

}



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