Skip to contentSkip to conversation

include/usb: change USB_CTRL_{SET,GET}_TIMEOUT to msecs

PATCH In review Nishanth Aravamudan 1 participant 1 message May 19, 2005 USB

lore
Share & tools
lore
#0 lore raw

PATCH 2/63 include/usb: change USB_CTRL_{SET,GET}_TIMEOUT to msecs

Hi,

Sent to everyone so that build and compile tests will be possible. These constants are used all over, but only with respect to these usb_*_msg() functions. Only Greg should need to pull this into a tree, though, to send upstream.

Thanks,
Nish

Description: Change the units of the timeout constants in usb.h to correspond to the new parameter units for usb_{control,bulk}_msg(), in this case from seconds to milliseconds.

include/linux/usb.h +3 -3
@@ -986,13 +986,13 @@ extern int usb_reset_configuration(struc
 extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate);
 
 /*
- * timeouts, in seconds, used for sending/receiving control messages
+ * timeouts, in milliseconds, used for sending/receiving control messages
  * they typically complete within a few frames (msec) after they're issued
  * USB identifies 5 second timeouts, maybe more in a few cases, and a few
  * slow devices (like some MGE Ellipse UPSes) actually push that limit.
  */
-#define USB_CTRL_GET_TIMEOUT	5
-#define USB_CTRL_SET_TIMEOUT	5
+#define USB_CTRL_GET_TIMEOUT	5000
+#define USB_CTRL_SET_TIMEOUT	5000
 
 
 /**