]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/ikalogic-scanalogic2/protocol.c
drivers: Consistently use same indentation for config_*() API calls.
[libsigrok.git] / src / hardware / ikalogic-scanalogic2 / protocol.c
index 621fb000e53a161dca0409847296a3fe4b7129d7..6dd66999bd2b3e7fcb921904f80b00a47207021a 100644 (file)
@@ -28,7 +28,7 @@ static void stop_acquisition(struct sr_dev_inst *sdi)
 
        usb_source_remove(sdi->session, drvc->sr_ctx);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        sdi->status = SR_ST_ACTIVE;
 }
@@ -39,9 +39,9 @@ static void abort_acquisition(struct sr_dev_inst *sdi)
 
        usb_source_remove(sdi->session, drvc->sr_ctx);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
-       sdi->driver->dev_close(sdi);
+       sr_dev_close(sdi);
 }
 
 static void buffer_sample_data(const struct sr_dev_inst *sdi)
@@ -640,10 +640,6 @@ SR_PRIV int sl2_get_device_info(struct sr_dev_driver *di,
        if (sr_usb_open(drvc->sr_ctx->libusb_ctx, &usb) != SR_OK)
                return SR_ERR;
 
-       /*
-        * Determine if a kernel driver is active on this interface and, if so,
-        * detach it.
-        */
        if (libusb_kernel_driver_active(usb.devhdl, USB_INTERFACE) == 1) {
                ret = libusb_detach_kernel_driver(usb.devhdl,
                        USB_INTERFACE);