Commit eba7db30 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] remove CONFIG_USB_LONG_TIMEOUT

Basically, no point in having short and long timeout options
where both are _shorter_ than the timeout from the USB spec.
parent dda4bcab
......@@ -38,18 +38,6 @@ config USB_DEVICEFS
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
......
......@@ -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
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment