svn commit: r261473 - stable/8/lib/libusb

[Hans Petter Selasky]

Author: hselasky
Date: Tue Feb  4 08:58:12 2014
New Revision: 261473
URL: http://svnweb.freebsd.org/changeset/base/261473

Log:
  MFC r261224:
  Comply to the official LibUSB v1.0 API:
  "It is legal to attempt to claim an already-claimed interface."

Modified:
  stable/8/lib/libusb/libusb10.c
Directory Properties:
  stable/8/lib/   (props changed)
  stable/8/lib/libusb/   (props changed)

Modified: stable/8/lib/libusb/libusb10.c
==============================================================================
--- stable/8/lib/libusb/libusb10.c	Tue Feb  4 08:55:44 2014	(r261472)
+++ stable/8/lib/libusb/libusb10.c	Tue Feb  4 08:58:12 2014	(r261473)
@@ -592,7 +592,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)
@@ -602,13 +601,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