X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fapi.c;h=a18557cf5f0cd94986a4843b1e0f50a256d69077;hb=d586a7f4bd0d83a1e432d5ca1ee63af94bdb4e13;hp=070357b3fc5bee267b896135d4de12125145d63f;hpb=0f34cb472368be61aa2e7bc9d9d1b25bb28aa560;p=libsigrok.git diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c index 070357b3..a18557cf 100644 --- a/src/hardware/ikalogic-scanalogic2/api.c +++ b/src/hardware/ikalogic-scanalogic2/api.c @@ -77,7 +77,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, USB_VID_PID); - if (usb_devices == NULL) + if (!usb_devices) return NULL; for (l = usb_devices; l; l = l->next) { @@ -225,11 +225,11 @@ static int dev_open(struct sr_dev_inst *sdi) libusb_fill_control_transfer(devc->xfer_in, usb->devhdl, devc->xfer_buf_in, sl2_receive_transfer_in, - sdi, USB_TIMEOUT); + sdi, USB_TIMEOUT_MS); libusb_fill_control_transfer(devc->xfer_out, usb->devhdl, devc->xfer_buf_out, sl2_receive_transfer_out, - sdi, USB_TIMEOUT); + sdi, USB_TIMEOUT_MS); memset(buffer, 0, sizeof(buffer));