KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Comply to the official LibUSB v1.0 API:

Browse Source 
"It is legal to attempt to claim an already-claimed interface."

MFC after:	1 week
This commit is contained in:
Hans Petter Selasky
2014-01-28 07:21:46 +00:00
parent c297f0e497
commit 7766d56803
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libusb/libusb10.c
+2 -6
View File
@@ -611,7 +611,6 @@ int
libusb_claim_interface(struct libusb20_device *pdev, int interface_number) libusb_claim_interface(struct libusb20_device *pdev, int interface_number)
{ {
libusb_device *dev; libusb_device *dev;
int err = 0;
dev = libusb_get_device(pdev); dev = libusb_get_device(pdev);
if (dev == NULL) if (dev == NULL)
@@ -621,13 +620,10 @@ libusb_claim_interface(struct libusb20_device *pdev, int interface_number)
return (LIBUSB_ERROR_INVALID_PARAM); return (LIBUSB_ERROR_INVALID_PARAM);
CTX_LOCK(dev->ctx); CTX_LOCK(dev->ctx);
if (dev->claimed_interfaces & (1 << interface_number))
err = LIBUSB_ERROR_BUSY;
if (!err)
dev->claimed_interfaces |= (1 << interface_number); dev->claimed_interfaces |= (1 << interface_number);
CTX_UNLOCK(dev->ctx); CTX_UNLOCK(dev->ctx);
return (err);
return (0);
} }
int int