From eba7db3023eb4c0911336d6c8dff8317a750c36b Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sat, 23 Nov 2002 07:33:53 -0800 Subject: [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. --- include/linux/usb.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'include') 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 /** -- cgit v1.2.3