X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fapi.c;h=e5160856624726a110c65d66dfc0edf9091befda;hb=refs%2Ftags%2Fdsupstream;hp=db890d908f9dbcad1aa0bc150b0916fc719bd332;hpb=0f1506497b615b3c935b9a7bce9af85390a09d24;p=libsigrok.git

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index db890d90..e5160856 100644
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -69,7 +69,7 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+	return std_hw_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -85,9 +85,6 @@ static GSList *hw_scan(GSList *options)
 
 	drvc = di->priv;
 
-	/* USB scan is always authoritative. */
-	clear_instances();
-
 	conn = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -229,14 +226,13 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	int ret;
 
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
+
 	if (!di->priv) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("Device inactive, can't set config options.");
-		return SR_ERR;
-	}
 
 	devc = sdi->priv;
 	ret = SR_OK;
@@ -369,6 +365,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	int ret, i;
 	unsigned char cmd[3], resp[4], *buf;
 
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
+
 	if (!di->priv) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
@@ -385,7 +384,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_dbg("Starting log retrieval.");
 
 	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
 	packet.type = SR_DF_META;