sr_dev_clear(): Always free sdi->priv (devc).

[libsigrok.git] / src / hardware / ikalogic-scanalogic2 / api.c

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 66be858fac2376fbf093e90e58f1c45d66876012..2078b8015c4e8a61d1115af31b6418a5ce63c78a 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -152,22 +152,19 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return std_scan_complete(di, devices);
 }
 
-static void clear_dev_context(void *priv)
+static void clear_helper(void *priv)
 {
        struct dev_context *devc;
 
        devc = priv;
 
-       sr_dbg("Device context cleared.");
-
        libusb_free_transfer(devc->xfer_in);
        libusb_free_transfer(devc->xfer_out);
-       g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, &clear_dev_context);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -232,8 +229,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
@@ -244,13 +239,12 @@ static int dev_close(struct sr_dev_inst *sdi)
        usb = sdi->conn;
 
        if (!usb->devhdl)
-               return SR_OK;
+               return SR_ERR_BUG;
 
        libusb_release_interface(usb->devhdl, USB_INTERFACE);
        libusb_close(usb->devhdl);
 
        usb->devhdl = NULL;
-       sdi->status = SR_ST_INACTIVE;
 
        return SR_OK;
 }
@@ -426,8 +420,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        usb_source_add(sdi->session, drvc->sr_ctx, 100,
                        ikalogic_scanalogic2_receive_data, (void *)sdi);
 
-       sr_dbg("Acquisition started successfully.");
-
        std_session_send_df_header(sdi);
 
        devc->next_state = STATE_SAMPLE;