Shorten probe_names[] arrays everywhere.

[libsigrok.git] / hardware / victor-dmm / api.c

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index a389b0794799932f62ee0aeb803ff286b603faa0..63ae5fb7365c6577098033e87ba7714bc155c75c 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -46,6 +46,7 @@ static const int hwcaps[] = {
 
 static const char *probe_names[] = {
        "P1",
+       NULL,
 };
 
 /* Properly close and free all devices. */
@@ -194,8 +195,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
        /* The device reports as HID class, so the kernel would have
         * claimed it. */
        if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
-               if (libusb_detach_kernel_driver(devc->usb->devhdl, 0) < 0) {
-                       sr_err("Failed to detach kernel driver.");
+               if ((ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0)) < 0) {
+                       sr_err("Failed to detach kernel driver: %s.",
+                              libusb_error_name(ret));
                        return SR_ERR;
                }
        }
@@ -339,15 +341,15 @@ static void receive_transfer(struct libusb_transfer *transfer)
                if ((ret = libusb_submit_transfer(transfer) != 0)) {
                        sr_err("Unable to resubmit transfer: %s.",
                               libusb_error_name(ret));
-                       libusb_free_transfer(transfer);
                        g_free(transfer->buffer);
+                       libusb_free_transfer(transfer);
                        hw_dev_acquisition_stop(sdi, sdi);
                }
        } else {
                /* This was the last transfer we're going to receive, so
                 * clean up now. */
-               libusb_free_transfer(transfer);
                g_free(transfer->buffer);
+               libusb_free_transfer(transfer);
        }
 }