From a318d18d818d29751c279c595e28ffd0b3ac21b8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 5 Mar 2017 17:26:45 +0100 Subject: if there is no timeout, just check if anything is in the interrupt queue --- libgphoto2_port/libusb1/libusb1.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index cf36fc512..b082b77b5 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -676,6 +676,9 @@ gp_libusb1_check_int (GPPort *port, char *bytes, int size, int timeout) if (port->pl->nrofirqs) goto handleirq; + if (!timeout) + return GP_ERROR_TIMEOUT; + tv.tv_sec = timeout/1000; tv.tv_usec = (timeout%1000)*1000; -- cgit v1.2.1