core: Do not arm timer-fd for transfers where the os handles timeout

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/libusb/io.c b/libusb/io.c
index 3757f44..13388cc 100644 (file)
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -1338,7 +1338,7 @@ static int arm_timerfd_for_next_timeout(struct libusb_context *ctx)
                        goto disarm;
 
                /* act on first transfer that has not already been handled */
-               if (!(transfer->timeout_flags & USBI_TRANSFER_TIMEOUT_HANDLED)) {
+               if (!(transfer->timeout_flags & (USBI_TRANSFER_TIMEOUT_HANDLED | USBI_TRANSFER_OS_HANDLES_TIMEOUT))) {
                        int r;
                        const struct itimerspec it = { {0, 0},
                                { cur_tv->tv_sec, cur_tv->tv_usec * 1000 } };

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index de73e86..f39bf48 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11132
+#define LIBUSB_NANO 11133