GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-03 10:35:03 +00:00
Code Issues Releases Wiki Activity

Do not use locking on usb callback function pthread signalling to prevent deadlock with libusb's own event lock.

Browse Source
This commit is contained in:
Con Kolivas 2013-10-14 09:40:23 +11:00
parent d2d7a7468e
commit 8d1604a2e3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usbutils.c
View File

@ -2248,9 +2248,7 @@ static void LIBUSB_CALL transfer_callback(struct libusb_transfer *transfer)
{ {
struct usb_transfer *ut = transfer->user_data; struct usb_transfer *ut = transfer->user_data;
mutex_lock(&ut->mutex);
pthread_cond_signal(&ut->cond); pthread_cond_signal(&ut->cond);
mutex_unlock(&ut->mutex);
} }
/* Wait for callback function to tell us it has finished the USB transfer, but /* Wait for callback function to tell us it has finished the USB transfer, but
@ -2272,7 +2270,6 @@ static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int
libusb_cancel_transfer(transfer); libusb_cancel_transfer(transfer);
/* Now wait for the callback function to be invoked. */ /* Now wait for the callback function to be invoked. */
mutex_lock(&ut->mutex);
pthread_cond_wait(&ut->cond, &ut->mutex); pthread_cond_wait(&ut->cond, &ut->mutex);
} }
ret = transfer->status; ret = transfer->status;