diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-11-26 19:24:48 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-11-26 19:24:48 -0800 |
| commit | 6406f3a956e26a2e22738256a342c55444378ca4 (patch) | |
| tree | e89d43c4cd4998644cf790b898f5c54abaaee336 /include/linux | |
| parent | 828bb5f408cbae3c7dae1545f3ceb0bba55cdf47 (diff) | |
| parent | b6f5eb6a38edd381a1dc0c5824c348cfec526409 (diff) | |
Merge kroah.com:/home/linux/linux/BK/bleeding-2.5
into kroah.com:/home/linux/linux/BK/gregkh-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 0f486d95bdb7..774d35815121 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -901,14 +901,11 @@ extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); /* * timeouts, in seconds, 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. */ -#ifdef CONFIG_USB_LONG_TIMEOUT -#define USB_CTRL_GET_TIMEOUT 4 -#else -#define USB_CTRL_GET_TIMEOUT 3 -#endif - -#define USB_CTRL_SET_TIMEOUT 3 +#define USB_CTRL_GET_TIMEOUT 5 +#define USB_CTRL_SET_TIMEOUT 5 /** |