diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-06-06 16:40:54 +0200 |
|---|---|---|
| committer | Nathan Hjelm <hjelmn@me.com> | 2016-08-17 12:52:40 -0600 |
| commit | e9d9c7382c596aeba67849d110eca0d28ed20386 (patch) | |
| tree | 9d37958a74ea38a347774ce658d3c93454bba810 | |
| parent | a5302ff86db391e6797a32693c242ddade5a09c2 (diff) | |
| download | libusb-e9d9c7382c596aeba67849d110eca0d28ed20386.tar.gz | |
wince: Do not differ between cancel / timeout ourselves
(itransfer->flags & USBI_TRANSFER_TIMED_OUT) is already checked by
usbi_handle_transfer_cancellation(), which wince_transfer_callback()
will call when status == LIBUSB_TRANSFER_CANCELLED. Leave this up
to the core, so that future changes to timeout handling do no break
wince.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Note: untested
| -rw-r--r-- | libusb/os/wince_usb.c | 9 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/libusb/os/wince_usb.c b/libusb/os/wince_usb.c index 85c584b..89b5e65 100644 --- a/libusb/os/wince_usb.c +++ b/libusb/os/wince_usb.c @@ -720,13 +720,8 @@ static void wince_transfer_callback( status = LIBUSB_TRANSFER_TIMED_OUT; break; case ERROR_OPERATION_ABORTED: - if (itransfer->flags & USBI_TRANSFER_TIMED_OUT) { - usbi_dbg("detected timeout"); - status = LIBUSB_TRANSFER_TIMED_OUT; - } else { - usbi_dbg("detected operation aborted"); - status = LIBUSB_TRANSFER_CANCELLED; - } + usbi_dbg("detected operation aborted"); + status = LIBUSB_TRANSFER_CANCELLED; break; default: usbi_err(ITRANSFER_CTX(itransfer), "detected I/O error: %s", windows_error_str(io_result)); diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 74e5d3b..335ae07 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11129 +#define LIBUSB_NANO 11130 |