X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=940288e49a70390d01a2f907345ed2ffbdc4b672;hb=refs%2Ftags%2Fdsupstream;hp=abf9db63489a0a0fc9887112cb509ec52ee5471c;hpb=46a743c1fa77b1b68ada2b642c095b4f9034edce;p=libsigrok.git

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index abf9db63..940288e4 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -251,7 +251,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)
@@ -269,13 +269,10 @@ static GSList *hw_scan(GSList *options)
 	const char *conn;
 
 	drvc = di->priv;
-	drvc->instances = NULL;
 
 	devcnt = 0;
 	devices = 0;
 
-	clear_instances();
-
 	conn = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -473,7 +470,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 	char **targets;
 
 	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR;
+		return SR_ERR_DEV_CLOSED;
 
 	ret = SR_OK;
 	devc = sdi->priv;
@@ -926,7 +923,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	int i;
 
 	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR;
+		return SR_ERR_DEV_CLOSED;
 
 	devc = sdi->priv;
 	devc->cb_data = cb_data;
@@ -950,7 +947,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	free(lupfd);
 
 	/* 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);
 
 	return SR_OK;
 }