X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fapi.c;h=8e8f0276e60c8a97b8fd7f0083966004da19e10c;hb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;hp=e82302618693c76f09de61eb89e847c9063785c8;hpb=41812aca436805b0614f2a8f31cf2f8ce494aea0;p=libsigrok.git diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c index e8230261..8e8f0276 100644 --- a/src/hardware/victor-dmm/api.c +++ b/src/hardware/victor-dmm/api.c @@ -17,11 +17,12 @@ * along with this program. If not, see . */ +#include #include #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "protocol.h" @@ -62,7 +63,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) struct libusb_device_descriptor des; libusb_device **devlist; GSList *devices; - int ret, i; + int i; char connection_id[64]; (void)options; @@ -72,11 +73,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) devices = NULL; 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)) != 0) { - sr_warn("Failed to get device descriptor: %s", - libusb_error_name(ret)); - continue; - } + libusb_get_device_descriptor(devlist[i], &des); if (des.idVendor != VICTOR_VID || des.idProduct != VICTOR_PID) continue; @@ -92,7 +89,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->priv = devc; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); - sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); sdi->inst_type = SR_INST_USB;