X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fusb.c;h=3da583218ca6ff02921831b80607a6b2af5e8ec2;hb=acac8fc3500bc1f1e9e43c1508638488d91b2f86;hp=9a38c089ef8630883d4e7637d64504d94023178f;hpb=e7f378fd1ab895259cda8b0545663b39c7bc16f0;p=libsigrok.git diff --git a/hardware/common/usb.c b/hardware/common/usb.c index 9a38c089..3da58321 100644 --- a/hardware/common/usb.c +++ b/hardware/common/usb.c @@ -144,7 +144,7 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb) struct libusb_device_descriptor des; int ret, r, cnt, i, a, b; - sr_dbg("Trying to open USB device."); + sr_dbg("Trying to open USB device %d.%d.", usb->bus, usb->address); if ((cnt = libusb_get_device_list(usb_ctx, &devlist)) < 0) { sr_err("Failed to retrieve device list: %s.", @@ -162,11 +162,8 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb) b = libusb_get_bus_number(devlist[i]); a = libusb_get_device_address(devlist[i]); - - if (b != usb->bus || a != usb->address) { - sr_spew("bus.address = %d.%d does not match.", b, a); + if (b != usb->bus || a != usb->address) continue; - } if ((r = libusb_open(devlist[i], &usb->devhdl)) < 0) { sr_err("Failed to open device: %s.",