From 1a35971be98752c483bf919f28c077daa3057a85 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 6 Nov 2007 15:42:23 +0000 Subject: [PATCH] bumped timeout to 175 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10848 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/canon/ChangeLog | 4 ++++ camlibs/canon/usb.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog index 06d16a49a..29c8588b4 100644 --- a/camlibs/canon/ChangeLog +++ b/camlibs/canon/ChangeLog @@ -1,3 +1,7 @@ +2007-11-06 Marcus Meissner + + * usb.c: Bumped timeout to 175. + 2007-09-02 Marcus Meissner * canon.c: Handle IXUS 30 also in ptp driver. diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index 2acad38b6..42e13c2da 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -72,7 +72,7 @@ /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for * an URB to come back on an interrupt endpoint */ -#define CANON_FAST_TIMEOUT 75 +#define CANON_FAST_TIMEOUT 175 /* WARNING: This destroys reentrancy of the code. Better to put this * in the camera descriptor somewhere. */