sr_dev_close(): Set status to SR_ST_INACTIVE.

[libsigrok.git] / src / hardware / lecroy-logicstudio / api.c

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index 60325fe4b66bd23ff3d84f548de6630eb0f8e871..c3007e4210da344695493dd71a17408bb4819663 100644 (file)
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -191,9 +191,6 @@ static int open_device(struct sr_dev_inst *sdi)
        size_t i;
        int r;
 
-       if (sdi->status == SR_ST_ACTIVE)
-               return SR_ERR;
-
        drvc = sdi->driver->context;
        usb = sdi->conn;
 
@@ -340,15 +337,13 @@ static int dev_close(struct sr_dev_inst *sdi)
        }
 
        if (!usb->devhdl)
-               return SR_ERR;
+               return SR_ERR_BUG;
 
        libusb_release_interface(usb->devhdl, 0);
 
        libusb_close(usb->devhdl);
        usb->devhdl = NULL;
 
-       sdi->status = SR_ST_INACTIVE;
-
        return SR_OK;
 }
 
@@ -390,9 +385,6 @@ static int config_set(uint32_t key, GVariant *data,
 
        devc = sdi->priv;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        switch (key) {
        case SR_CONF_SAMPLERATE:
                return lls_set_samplerate(sdi, g_variant_get_uint64(data));
@@ -472,15 +464,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct drv_context *drvc;
        int ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        drvc = sdi->driver->context;
 
        if ((ret = lls_start_acquisition(sdi)) < 0)
                return ret;
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        return usb_source_add(sdi->session, drvc->sr_ctx, 100,
                receive_usb_data, drvc);
@@ -488,9 +477,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        return lls_stop_acquisition(sdi);
 }