X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fvictor-dmm%2Fapi.c;h=994151f0b3ffa299613321deb92293cb7188559c;hb=refs%2Ftags%2Fdsupstream;hp=2222797d5d15d11403d5a4438d4bb0c043899974;hpb=8bb2981df075082071b3edf2426a3444109726f0;p=libsigrok.git

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index 2222797d..994151f0 100644
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -77,7 +77,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)
@@ -95,9 +95,6 @@ static GSList *hw_scan(GSList *options)
 
 	drvc = di->priv;
 
-	/* USB scan is always authoritative. */
-	clear_instances();
-
 	devices = NULL;
 	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
 	for (i = 0; devlist[i]; i++) {
@@ -257,6 +254,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 	gint64 now;
 	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;
@@ -396,6 +396,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	int ret, i;
 	unsigned char *buf;
 
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
+
 	if (!di->priv) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
@@ -406,7 +409,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	devc->cb_data = cb_data;
 
 	/* 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);
 
 	pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
 	for (i = 0; pfd[i]; i++) {