diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2015-05-17 21:19:28 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2015-05-17 21:19:28 +0000 |
| commit | 0544cd0fd3bce85d0314a9d33d98766e6209ab53 (patch) | |
| tree | 7b38f8c7f580016f5651d572f1696038a52dfdd5 /libgphoto2_port | |
| parent | bf789225ef2566b9a37cb241b3ddcfd6e0a77636 (diff) | |
| download | libgphoto2-0544cd0fd3bce85d0314a9d33d98766e6209ab53.tar.gz | |
intterupt timeout is ok
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15441 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port')
| -rw-r--r-- | libgphoto2_port/libusb1/libusb1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index a3d6d180e..8900ffc72 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -627,11 +627,12 @@ gp_libusb1_check_int (GPPort *port, char *bytes, int size, int timeout) if (port->pl->nrofirqs) goto handleirq; - LOG_ON_LIBUSB_E(ret = libusb_interrupt_transfer(port->pl->dh, port->settings.usb.intep, (unsigned char*)bytes, size, &retsize, timeout)); + ret = libusb_interrupt_transfer(port->pl->dh, port->settings.usb.intep, (unsigned char*)bytes, size, &retsize, timeout); + if (ret != LIBUSB_ERROR_TIMEOUT) LOG_ON_LIBUSB_E(ret); /* We might have got an interrupt from this transfer, or from on of the queued ones. * If we timed out, but the queue got one, return the one from the queue. */ - if ((ret == LIBUSB_ERROR_TIMEOUT) && (port->pl->nrofirqs)) + if ((ret == LIBUSB_ERROR_TIMEOUT) && port->pl->nrofirqs) goto handleirq; if (ret < LIBUSB_SUCCESS) |