1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00

Merge branch 'master' of github.com:ckolivas/cgminer into redfury

This commit is contained in:
Con Kolivas 2013-09-27 14:35:35 +10:00
commit 2ba7fbe597

View File

@ -2307,7 +2307,7 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle, int intinfo,
STATS_TIMEVAL(&tv_start);
cg_rlock(&cgusb_fd_lock);
err = libusb_bulk_transfer(dev_handle, endpoint, data, length,
err = libusb_bulk_transfer(dev_handle, endpoint, buf, length,
transferred, timeout);
errn = errno;
cg_runlock(&cgusb_fd_lock);
@ -2355,7 +2355,7 @@ usb_bulk_transfer(struct libusb_device_handle *dev_handle, int intinfo,
if (err)
cgpu->usbinfo.clear_fail_count++;
}
if (endpoint == LIBUSB_ENDPOINT_OUT)
if ((endpoint & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_IN)
memcpy(data, buf, length);
return err;