diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:20 -0400 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /drivers/usb/class/usbtmc.c | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 |