diff -upr libgphoto2-2.4.3/camlibs/canon/usb.c libgphoto2-2.4.3.rlh/camlibs/canon/usb.c
--- libgphoto2-2.4.3/camlibs/canon/usb.c	2008-08-08 16:12:57.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/canon/usb.c	2009-03-31 12:44:05.000000000 -0400
@@ -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 175
+#define CANON_FAST_TIMEOUT 500
 
 /* WARNING: This destroys reentrancy of the code. Better to put this
  * in the camera descriptor somewhere. */
diff -upr libgphoto2-2.4.3/camlibs/ptp2/library.c libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c
--- libgphoto2-2.4.3/camlibs/ptp2/library.c	2008-10-19 12:41:36.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c	2009-03-31 12:44:49.000000000 -0400
@@ -59,7 +59,7 @@
 #define GP_MODULE "PTP2"
 
 #define USB_START_TIMEOUT 8000
-#define USB_CANON_START_TIMEOUT 500	/* 0.5 seconds */
+#define USB_CANON_START_TIMEOUT 1500	/* 1.5 seconds */
 #define USB_NORMAL_TIMEOUT 20000
 #define USB_TIMEOUT_CAPTURE 20000