diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-06-06 16:53:53 +0200 |
|---|---|---|
| committer | Nathan Hjelm <hjelmn@me.com> | 2016-08-17 12:52:40 -0600 |
| commit | 06e86793be2efe098022fcba20be8624285132f1 (patch) | |
| tree | 071cf1a6a98e81a05466b9455d95c13d9aaac9b9 /libusb | |
| parent | 138b661f4214e9fc10e836f3a8abebeb166da896 (diff) | |
| download | libusb-06e86793be2efe098022fcba20be8624285132f1.tar.gz | |
core: Do not arm timer-fd for transfers where the os handles timeout
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'libusb')
| -rw-r--r-- | libusb/io.c | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/io.c b/libusb/io.c index 3757f44..13388cc 100644 --- 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 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11132 +#define LIBUSB_NANO 11133 |