diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2013-08-18 19:57:46 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2013-08-18 19:57:46 +0000 |
| commit | ab8a8e190c5a388450cb782049bfad710ad15879 (patch) | |
| tree | 63caffda2d600460dd8462daf20db1dd285866d7 /camlibs/canon | |
| parent | cb1206e5f4968292b537f137682768b137e0b1ab (diff) | |
| download | libgphoto2-ab8a8e190c5a388450cb782049bfad710ad15879.tar.gz | |
From: Wolfram Sang <wolfram@the-dreams.de>
fixed wait_for_event by fixing the errorcode
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14503 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
| -rw-r--r-- | camlibs/canon/usb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index 7be53d507..b4ddff003 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -911,8 +911,11 @@ static int canon_usb_poll_interrupt_pipe ( Camera *camera, unsigned char *buf, u gettimeofday ( &cur, NULL ); curduration = (cur.tv_sec-start.tv_sec)*1000 + (cur.tv_usec-start.tv_usec)/1000; - if (curduration >= timeout) + if (curduration >= timeout) { + /* Timeout is not an error */ + status = 0; break; + } } gettimeofday ( &end, NULL ); |