X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/bdffae3cefd6308e45d049d31553edc16a52dc74..daa272b7823da525bb7a7fee01534591833d4a2e:/src/am7xxx.c

diff --git a/src/am7xxx.c b/src/am7xxx.c
index db7ca9a..1b3b758 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -708,6 +708,7 @@ static int open_device(am7xxx_context *ctx,
 		       am7xxx_device **dev)
 {
 	int ret;
+	int current_configuration;
 
 	*dev = find_device(ctx, device_index);
 	if (*dev == NULL) {
@@ -732,15 +733,21 @@ static int open_device(am7xxx_context *ctx,
 	 * to close it again before bailing out.
 	 */
 
-	ret = libusb_set_configuration((*dev)->usb_device,
-				       (*dev)->desc->configuration);
-	if (ret < 0) {
-		debug(ctx, "libusb_set_configuration failed\n");
-		debug(ctx, "Cannot set configuration %hhu\n",
-		      (*dev)->desc->configuration);
-		goto out_libusb_close;
+	current_configuration = -1;
+	libusb_get_configuration((*dev)->usb_device, &current_configuration);
+	if (current_configuration != (*dev)->desc->configuration) {
+		ret = libusb_set_configuration((*dev)->usb_device,
+					       (*dev)->desc->configuration);
+		if (ret < 0) {
+			debug(ctx, "libusb_set_configuration failed\n");
+			debug(ctx, "Cannot set configuration %hhu\n",
+			      (*dev)->desc->configuration);
+			goto out_libusb_close;
+		}
 	}
 
+	libusb_set_auto_detach_kernel_driver((*dev)->usb_device, 1);
+
 	ret = libusb_claim_interface((*dev)->usb_device,
 				     (*dev)->desc->interface_number);
 	if (ret < 0) {
@@ -749,6 +756,18 @@ static int open_device(am7xxx_context *ctx,
 		      (*dev)->desc->interface_number);
 		goto out_libusb_close;
 	}
+
+	/* Checking that the configuration has not changed, as suggested in
+	 * http://libusb.sourceforge.net/api-1.0/caveats.html
+	 */
+	current_configuration = -1;
+	libusb_get_configuration((*dev)->usb_device, &current_configuration);
+	if (current_configuration != (*dev)->desc->configuration) {
+		debug(ctx, "libusb configuration changed\n");
+		debug(ctx, "Cannot claim interface %hhu\n",
+		      (*dev)->desc->interface_number);
+		goto out_libusb_close;
+	}
 out:
 	return ret;