X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=709e36779a8b2dfa93418fdba9eabf51cbdc85bb;hb=8de8551b8809b0818c20690c3014df6e6c4ee7fc;hp=bccf7b6a685f5ade06818816cd1d7207cc8539bf;hpb=96127d0feaf7333fba880c5bcf1267de6360e6a8;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index bccf7b6a..709e3677 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <string.h>
@@ -182,7 +183,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
 	*configlen = buflen;
 
 cleanup:
-	if (!xfer_in->user_data || !xfer_in->user_data) {
+	if (!xfer_in->user_data || !xfer_out->user_data) {
 		if (!xfer_in->user_data)
 			libusb_cancel_transfer(xfer_in);
 		if (!xfer_out->user_data)
@@ -268,7 +269,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
 	}
 
 cleanup:
-	if (!xfer_in->user_data || !xfer_in->user_data) {
+	if (!xfer_in->user_data || !xfer_out->user_data) {
 		if (!xfer_in->user_data)
 			libusb_cancel_transfer(xfer_in);
 		if (!xfer_out->user_data)
@@ -351,9 +352,8 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
 	struct drv_context *drvc;
 	struct sr_dev_inst *sdi;
 	struct libusb_device **devlist;
-	struct libusb_device_descriptor des;
 	libusb_device_handle *dev_hdl;
-	int dummy, ret, i;
+	int dummy, i;
 	unsigned char config[MAX_CONFIGBLOCK_SIZE];
 
 	drvc = di->context;
@@ -361,11 +361,6 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
 
 	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
 	for (i = 0; devlist[i]; i++) {
-		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %d.", ret);
-			continue;
-		}
-
 		if (libusb_get_bus_number(devlist[i]) != bus ||
 				libusb_get_device_address(devlist[i]) != address)
 			continue;