diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /drivers/usb/class/usbtmc.c | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
| -rw-r--r-- | drivers/usb/class/usbtmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 864f0ba6a344..2473cf0c6b1d 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #define USBTMC_SIZE_IOBUFFER 2048 | 39 | #define USBTMC_SIZE_IOBUFFER 2048 |
| 40 | 40 | ||
| 41 | /* Default USB timeout (in milliseconds) */ | 41 | /* Default USB timeout (in milliseconds) */ |
| 42 | #define USBTMC_TIMEOUT 10 | 42 | #define USBTMC_TIMEOUT 5000 |
| 43 | 43 | ||
| 44 | /* | 44 | /* |
| 45 | * Maximum number of read cycles to empty bulk in endpoint during CLEAR and | 45 | * Maximum number of read cycles to empty bulk in endpoint during CLEAR and |