From owner-svn-src-stable-9@FreeBSD.ORG  Tue Feb  4 08:59:03 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8E741EC3;
 Tue,  4 Feb 2014 08:59:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 78DA9133E;
 Tue,  4 Feb 2014 08:59:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s148x3hK063036;
 Tue, 4 Feb 2014 08:59:03 GMT (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s148x3ZU063035;
 Tue, 4 Feb 2014 08:59:03 GMT (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201402040859.s148x3ZU063035@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 4 Feb 2014 08:59:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r261474 - stable/9/lib/libusb
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Feb 2014 08:59:03 -0000

Author: hselasky
Date: Tue Feb  4 08:59:02 2014
New Revision: 261474
URL: http://svnweb.freebsd.org/changeset/base/261474

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

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

Modified: stable/9/lib/libusb/libusb10.c
==============================================================================
--- stable/9/lib/libusb/libusb10.c	Tue Feb  4 08:58:12 2014	(r261473)
+++ stable/9/lib/libusb/libusb10.c	Tue Feb  4 08:59:02 2014	(r261474)
@@ -605,7 +605,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)
@@ -615,13 +614,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