Author: hselasky
Date: Tue Jan 28 07:21:46 2014
New Revision: 261224
URL: http://svnweb.freebsd.org/changeset/base/261224
Log:
Comply to the official LibUSB v1.0 API:
"It is legal to attempt to claim an already-claimed interface."
MFC after: 1 week
Modified:
head/lib/libusb/libusb10.c
Modified: head/lib/libusb/libusb10.c
==============================================================================
--- head/lib/libusb/libusb10.c Tue Jan 28 07:11:23 2014 (r261223)
+++ head/lib/libusb/libusb10.c Tue Jan 28 07:21:46 2014 (r261224)
@@ -611,7 +611,6 @@ int
libusb_claim_interface(struct libusb20_device *pdev, int interface_number)
{
libusb_device *dev;
- int err = 0;
dev = libusb_get_device(pdev);
if (dev == NULL)
@@ -621,13 +620,10 @@ libusb_claim_interface(struct libusb20_d
return (LIBUSB_ERROR_INVALID_PARAM);
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);
- return (err);
+
+ return (0);
}
int
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
