commit d97e85ef4ad3a9747823421e54c31dde874c0c04
author Vegard Storheil Eriksen <zyp@jvnv.net> Mon Feb 15 22:57:06 2021 +0100
committer Nathan Hjelm <hjelmn@cs.unm.edu> Mon Feb 15 21:05:42 2021 -0700
tree 66cdb9796034f02cdf94e57efda1e9fbc276b761
parent 28a11d116334f1c7361087a6aeb176c36a3c5145

darwin: Don't drop partial data on timeout

A timed out transfer might have been partially filled. Propagate
tpriv->size to avoid dropping this data.

Closes #876

Signed-off-by: Nathan Hjelm <hjelmn@cs.unm.edu>

libusb/os/darwin_usb.c

diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index 247954a..337dc92 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -2169,7 +2169,7 @@
 
   usbi_dbg ("handling transfer completion type %s with kernel status %d", transfer_types[transfer->type], tpriv->result);
 
-  if (kIOReturnSuccess == tpriv->result || kIOReturnUnderrun == tpriv->result) {
+  if (kIOReturnSuccess == tpriv->result || kIOReturnUnderrun == tpriv->result || kIOUSBTransactionTimeout == tpriv->result) {
     if (is_isoc && tpriv->isoc_framelist) {
       /* copy isochronous results back */
 

libusb/version_nano.h

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 4843a50..ff59c20 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11605
+#define LIBUSB_NANO 11606