From 2f5023c41d3176e56bf0abc521b7c5f8b1ac4664 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zolt=C3=A1n=20Kov=C3=A1cs?= <0x4b5a@gmail.com>
Date: Tue, 29 Jan 2013 00:14:29 +0000
Subject: [PATCH] Core: Don't wait for completion if cancel_transfer failed

* See http://libusbx.1081486.n5.nabble.com/Libusbx-devel-libusb-interrupt-transfer-does-not-return-in-case-of-error-td626.html
* Closes #76
---
 AUTHORS               |  1 +
 libusb/sync.c         | 18 ++++++++++--------
 libusb/version_nano.h |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index cb0511a..88c7ab5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,4 +48,5 @@ Uri Lublin
 Vasily Khoruzhick
 Vitali Lovich
 Xiaofan Chen
+Zoltán Kovács
 Роман Донченко
diff --git a/libusb/sync.c b/libusb/sync.c
index 5033387..b9a72e4 100644
--- a/libusb/sync.c
+++ b/libusb/sync.c
@@ -106,10 +106,11 @@ int API_EXPORTED libusb_control_transfer(libusb_device_handle *dev_handle,
 		if (r < 0) {
 			if (r == LIBUSB_ERROR_INTERRUPTED)
 				continue;
-			libusb_cancel_transfer(transfer);
-			while (!completed)
-				if (libusb_handle_events_completed(HANDLE_CTX(dev_handle), &completed) < 0)
-					break;
+			if (libusb_cancel_transfer(transfer) == LIBUSB_SUCCESS) {
+				while (!completed)
+					if (libusb_handle_events_completed(HANDLE_CTX(dev_handle), &completed) < 0)
+						break;
+			}
 			libusb_free_transfer(transfer);
 			return r;
 		}
@@ -183,10 +184,11 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
 		if (r < 0) {
 			if (r == LIBUSB_ERROR_INTERRUPTED)
 				continue;
-			libusb_cancel_transfer(transfer);
-			while (!completed)
-				if (libusb_handle_events_completed(HANDLE_CTX(dev_handle), &completed) < 0)
-					break;
+			if (libusb_cancel_transfer(transfer) == LIBUSB_SUCCESS) {
+				while (!completed)
+					if (libusb_handle_events_completed(HANDLE_CTX(dev_handle), &completed) < 0)
+						break;
+			}
 			libusb_free_transfer(transfer);
 			return r;
 		}
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 7e52a56..7f14aa2 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10598
+#define LIBUSB_NANO 10599
-- 
2.7.4