summaryrefslogtreecommitdiff
path: root/camlibs/digita
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes@erdfelt.com>2002-04-10 06:31:11 +0000
committerJohannes Erdfelt <johannes@erdfelt.com>2002-04-10 06:31:11 +0000
commit57a4607dfae6196853d1272abe4117282c7986cc (patch)
treefa1cfc8100fe9adbdf0d69a957286abb2dea05cc /camlibs/digita
parente8f3897590f448f99dee71d93b301efd4255ec50 (diff)
downloadlibgphoto2-57a4607dfae6196853d1272abe4117282c7986cc.tar.gz
Reset the timeout much lower for mopping up anything left behind
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4409 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/digita')
-rw-r--r--camlibs/digita/usb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/camlibs/digita/usb.c b/camlibs/digita/usb.c
index 3b645aee0..673c22ceb 100644
--- a/camlibs/digita/usb.c
+++ b/camlibs/digita/usb.c
@@ -62,10 +62,14 @@ int digita_usb_open(CameraPrivateLibrary *dev, Camera *camera)
dev->send = digita_usb_send;
dev->read = digita_usb_read;
+ gp_port_set_timeout(camera->port, 100);
+
/* Mop up anything still pending */
while (gp_port_read(dev->gpdev, buffer, sizeof(buffer)) > 0)
;
+ gp_port_set_timeout(camera->port, 10000);
+
return GP_OK;
}