Basically, no point in having short and long timeout options
where both are _shorter_ than the timeout from the USB spec.
- Dave
--- ./include/linux-dist/usb.h Tue Nov 19 18:23:47 2002
+++ ./include/linux/usb.h Wed Nov 20 09:29:17 2002
@@ -901,14 +901,11 @@
/*
* 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
/**
--- ./drivers/usb-dist/core/Kconfig Tue Nov 19 18:26:23 2002
+++ ./drivers/usb/core/Kconfig Wed Nov 20 09:26:43 2002
@@ -38,18 +38,6 @@
Most users want to say Y here.
-config USB_LONG_TIMEOUT
- bool "Long timeout for slow-responding devices (some MGE Ellipse UPSes)"
- depends on USB
- help
- This option makes the standard time out a bit longer. Basically,
- some devices are just slow to respond, so this makes usb more
- patient. There should be no harm in selecting this, but it is
- needed for some MGE Ellipse UPSes.
-
- If you have an MGE Ellipse UPS, or you see timeouts in HID
- transactions, say Y; otherwise say N.
-
config USB_BANDWIDTH
bool "Enforce USB bandwidth allocation (EXPERIMENTAL)"
depends on USB && EXPERIMENTAL
