From 15d2a8b98b8c826cb8edfa91da0df84d56723875 Mon Sep 17 00:00:00 2001 From: hselasky Date: Tue, 4 Feb 2014 08:59:02 +0000 Subject: [PATCH] MFC r261224: Comply to the official LibUSB v1.0 API: "It is legal to attempt to claim an already-claimed interface." git-svn-id: svn://svn.freebsd.org/base/stable/9@261474 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libusb/libusb10.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 23bc2387e..bb8146c32 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -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_device *pdev, int interface_number) 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 -- 2.45.0