Commit 29f5fc48888aeddc4d6fb77ab7402ce262a2f95b
2013-06-14T22:48:18
Differentiate libusb control transfer pipe errors from transfer errors since they're not fatal.
diff --git a/usbutils.c b/usbutils.c
index e57b632..58f83bf 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -22,6 +22,10 @@
(err) == LIBUSB_ERROR_PIPE || \
(err) == LIBUSB_ERROR_OTHER)
+#define NOCONTROLDEV(err) ((err) == LIBUSB_ERROR_NO_DEVICE || \
+ (err) == LIBUSB_ERROR_OTHER)
+
+
#ifdef USE_BFLSC
#define DRV_BFLSC 1
#endif
@@ -2568,7 +2572,7 @@ int _usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest
if (buf)
free(buf);
- if (NODEV(err))
+ if (NOCONTROLDEV(err))
release_cgpu(cgpu);
out_unlock:
@@ -2614,7 +2618,7 @@ int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRe
if (err > 0) {
*amount = err;
err = 0;
- } else if (NODEV(err))
+ } else if (NOCONTROLDEV(err))
release_cgpu(cgpu);
out_unlock: