diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-12-01 01:18:34 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-12-01 01:18:34 -0600 |
| commit | b00a75ab131dc8ea758b1354428521d0f6279610 (patch) | |
| tree | 93ce1841f2ef4fb0886e021d464876d47f0d4e99 /include/linux/usb.h | |
| parent | 6f3caf1587dbccd4cab287c7319af8270a0057e3 (diff) | |
| parent | c9e540101f043fe4a713781513d675e3f3577b55 (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include/linux/usb.h')
| -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 /** |