diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2010-11-17 09:29:53 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2010-11-17 09:29:53 +0000 |
| commit | ed81f562d16b02148b36adc6d449632206fbed3b (patch) | |
| tree | 4e0371d58cc579c01f048135ae10b04e5e4ddc51 /camlibs/ptp2/usb.c | |
| parent | bb4d7ecee89457c4881a61dc117a1bcee836d618 (diff) | |
| download | libgphoto2-ed81f562d16b02148b36adc6d449632206fbed3b.tar.gz | |
handle result == 0 in event reader like a timeout
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13409 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/ptp2/usb.c')
| -rw-r--r-- | camlibs/ptp2/usb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/camlibs/ptp2/usb.c b/camlibs/ptp2/usb.c index 29bd7aaf4..7eb6fb5f1 100644 --- a/camlibs/ptp2/usb.c +++ b/camlibs/ptp2/usb.c @@ -517,6 +517,10 @@ ptp_usb_event (PTPParams* params, PTPContainer* event, int wait) return PTP_ERROR_TIMEOUT; return PTP_ERROR_IO; } + if (result == 0) { + gp_log (GP_LOG_DEBUG, "ptp2/usb_event", "reading event a 0 read occurred, reporting timeout."); + return PTP_ERROR_TIMEOUT; + } rlen = result; if (rlen < 8) { gp_log (GP_LOG_ERROR, "ptp2/usb_event", |