From: Uwe Hermann <redacted>
Date: Tue, 11 Mar 2014 18:46:39 +0000 (+0100)
Subject: scpi_usbtmc_libusb.c: Fix two error checks.
X-Git-Tag: libsigrok-0.3.0~121
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=9ad05e6cd28e5a4c7cc4f38d2dcb561a14bb5563;hp=d8cbd659ce2e24428c7e403eeebd50ad4a992caa;p=libsigrok.git

scpi_usbtmc_libusb.c: Fix two error checks.

Two error checks had a missing "ret = ", which lead to an incorrect
value being passed to libusb_error_name().

Also, lower the level for those messages from sr_err() to sr_dbg()
since they're not fatal.
---

diff --git a/hardware/common/scpi_usbtmc_libusb.c b/hardware/common/scpi_usbtmc_libusb.c
index c3884543..933ce83c 100644
--- a/hardware/common/scpi_usbtmc_libusb.c
+++ b/hardware/common/scpi_usbtmc_libusb.c
@@ -116,9 +116,9 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
 		}
 
 		for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
-			if (libusb_get_config_descriptor(devlist[i], confidx, &confdes) < 0) {
-				sr_err("Failed to get configuration descriptor: %s.",
-				       libusb_error_name(ret));
+			if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) {
+				sr_dbg("Failed to get configuration descriptor: %s, "
+				       "ignoring device.", libusb_error_name(ret));
 				break;
 			}
 			for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
@@ -200,9 +200,9 @@ static int scpi_usbtmc_libusb_open(void *priv)
 	}
 
 	for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
-		if (libusb_get_config_descriptor(dev, confidx, &confdes) < 0) {
-			sr_err("Failed to get configuration descriptor: %s.",
-			       libusb_error_name(ret));
+		if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) {
+			sr_dbg("Failed to get configuration descriptor: %s, "
+			       "ignoring device.", libusb_error_name(ret));
 			continue;
 		}
 		for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {