BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Uwe Hermann 2014-03-11 19:46:39 +01:00
parent d8cbd659ce
commit 9ad05e6cd2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/common/scpi_usbtmc_libusb.c
View File

@ -116,9 +116,9 @@ static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc)
} }
for (confidx = 0; confidx < des.bNumConfigurations; confidx++) { for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
if (libusb_get_config_descriptor(devlist[i], confidx, &confdes) < 0) { if ((ret = libusb_get_config_descriptor(devlist[i], confidx, &confdes)) < 0) {
sr_err("Failed to get configuration descriptor: %s.", sr_dbg("Failed to get configuration descriptor: %s, "
libusb_error_name(ret)); "ignoring device.", libusb_error_name(ret));
break; break;
} }
for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) { 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++) { for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
if (libusb_get_config_descriptor(dev, confidx, &confdes) < 0) { if ((ret = libusb_get_config_descriptor(dev, confidx, &confdes)) < 0) {
sr_err("Failed to get configuration descriptor: %s.", sr_dbg("Failed to get configuration descriptor: %s, "
libusb_error_name(ret)); "ignoring device.", libusb_error_name(ret));
continue; continue;
} }
for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) { for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {