aboutsummaryrefslogtreecommitdiff
path: root/lib/libusb
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2014-01-28 07:21:46 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2014-01-28 07:21:46 +0000
commit7766d568036287359bf7c11d03965f23c4b98baf (patch)
tree488d602f7226a52a86e9c7cad0949a3e470ae571 /lib/libusb
parentc297f0e497220f1d62b8de3e1eda1f33390f869f (diff)
Notes
Diffstat (limited to 'lib/libusb')
-rw-r--r--lib/libusb/libusb10.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index 79a570ed543f..c795ecfa176d 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -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_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