summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGergely Imreh <imrehg@gmail.com>2009-09-15 16:03:31 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-09 13:52:06 -0700
commit35f76e897d67fb62b4ec0be01fc0caaeb7f90108 (patch)
tree77ee722a2130cae09a32502e4a2e37630734f12a /drivers
parent0ee3a33a0481c8f5c9edb7a5a02f3c76496d9551 (diff)
downloadlinux-3.10-35f76e897d67fb62b4ec0be01fc0caaeb7f90108.tar.gz
linux-3.10-35f76e897d67fb62b4ec0be01fc0caaeb7f90108.tar.bz2
linux-3.10-35f76e897d67fb62b4ec0be01fc0caaeb7f90108.zip
USB: usbtmc: fix timeout increase
The current 10ms timeout is too short for some normal USBTMC device operation, increase it to a value which was tested with previously affected Tektronix oscilloscopes. Signed-off-by: Gergely Imreh <imrehg@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/class/usbtmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 864f0ba6a34..2473cf0c6b1 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -39,7 +39,7 @@
#define USBTMC_SIZE_IOBUFFER 2048
/* Default USB timeout (in milliseconds) */
-#define USBTMC_TIMEOUT 10
+#define USBTMC_TIMEOUT 5000
/*
* Maximum number of read cycles to empty bulk in endpoint during CLEAR and