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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede
2016-06-06 16:53:53 +02:00
committed by Nathan Hjelm
parent 138b661f42
commit 06e86793be
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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 } };
+1 -1
View File
@@ -1 +1 @@
#define LIBUSB_NANO 11132
#define LIBUSB_NANO 11133