X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/2f9553ff3efdbd00111e90774fd90907a2e45200..527bdcb4986dcd71fc4b173684fae4c24f1fcdea:/src/am7xxx.c

diff --git a/src/am7xxx.c b/src/am7xxx.c
index 6595ccf..94b01ac 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -489,8 +489,8 @@ static int send_data_async(am7xxx_device *dev, uint8_t *buffer, unsigned int len
 
 	/* Make a copy of the buffer so the caller can safely reuse it just
 	 * after libusb_submit_transfer() has returned. This technique
-	 * requires more allocations than a proper double-buffering approach
-	 * but it takes a lot less code. */
+	 * requires more dynamic allocations compared to a proper
+	 * double-buffering approach but it takes a lot less code. */
 	transfer_buffer = malloc(len);
 	if (transfer_buffer == NULL) {
 		error(dev->ctx, "cannot allocate transfer buffer (%s)\n",
@@ -734,16 +734,34 @@ static int open_device(am7xxx_context *ctx,
 	 */
 
 	current_configuration = -1;
-	libusb_get_configuration((*dev)->usb_device, &current_configuration);
+	ret = libusb_get_configuration((*dev)->usb_device,
+				       &current_configuration);
+	if (ret < 0) {
+		debug(ctx, "libusb_get_configuration failed: %s\n",
+		      libusb_error_name(ret));
+		goto out_libusb_close;
+	}
+
 	if (current_configuration != (*dev)->desc->configuration) {
 		/*
-		 * In principle kernel drivers bound to each interface should
-		 * be detached before setting the configuration, but in
-		 * practice this is not necessary for most devices.
+		 * In principle, before setting a new configuration, kernel
+		 * drivers should be detached from _all_ interfaces; for
+		 * example calling something like the following "invented"
+		 * function _before_ setting the new configuration:
 		 *
-		 * For example something like the following function would be
-		 * called:
-		 * 	libusb_detach_all_kernel_drivers((*dev)->usb_device);
+		 *   libusb_detach_all_kernel_drivers((*dev)->usb_device);
+		 *
+		 * However, in practice, this is not necessary for most
+		 * devices as they have only one configuration.
+		 *
+		 * When a device only has one configuration:
+		 *
+		 *   - if there was a kernel driver bound to the device, it
+		 *     had already set the configuration and the call below
+		 *     will be skipped;
+		 *
+		 *   - if no kernel driver was bound to the device, the call
+		 *     below will suceed.
 		 */
 		ret = libusb_set_configuration((*dev)->usb_device,
 					       (*dev)->desc->configuration);
@@ -772,16 +790,26 @@ static int open_device(am7xxx_context *ctx,
 	 * http://libusb.sourceforge.net/api-1.0/caveats.html
 	 */
 	current_configuration = -1;
-	libusb_get_configuration((*dev)->usb_device, &current_configuration);
+	ret = libusb_get_configuration((*dev)->usb_device,
+				       &current_configuration);
+	if (ret < 0) {
+		debug(ctx, "libusb_get_configuration after claim failed: %s\n",
+		      libusb_error_name(ret));
+		goto out_libusb_release_interface;
+	}
+
 	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;
+		debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n",
+		      (*dev)->desc->configuration, current_configuration);
+		ret = -EINVAL;
+		goto out_libusb_release_interface;
 	}
 out:
 	return ret;
 
+out_libusb_release_interface:
+	libusb_release_interface((*dev)->usb_device,
+				 (*dev)->desc->interface_number);
 out_libusb_close:
 	libusb_close((*dev)->usb_device);
 	(*dev)->usb_device = NULL;
@@ -1073,8 +1101,10 @@ AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx)
 	(*ctx)->log_level = AM7XXX_LOG_TRACE;
 
 	ret = libusb_init(&((*ctx)->usb_context));
-	if (ret < 0)
+	if (ret < 0) {
+		error(*ctx, "libusb_init failed: %s\n", libusb_error_name(ret));
 		goto out_free_context;
+	}
 
 	libusb_set_debug((*ctx)->usb_context, LIBUSB_LOG_LEVEL_INFO);