X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=7924b2311a2b1a4f72b056f37253682454243a8d;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=99af8dc006368302ec99758208ee4793ee32801a;hpb=e5ff8e9e0a12d54963814debeab50cd88ecca632;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 99af8dc0..7924b231 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -159,21 +159,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->vendor = g_strdup(manufacturer);
 		sdi->model = g_strdup(product);
 		sdi->version = g_strdup(hwrev);
-		sdi->driver = di;
 		sdi->priv = devc;
 
 		for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
 			chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
 			sr_channel_new(sdi, i, chtype, TRUE, channel_names[i]);
 		}
-
-		//Add the driver
-		struct drv_context *drvc = di->context;
-		drvc->instances = g_slist_append(drvc->instances, sdi);
-		devices = g_slist_append(devices, sdi);
 	}
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -386,7 +380,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	/* Reset trigger state. */
 	devc->trigger_state = 0x00;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Our first channel is analog, the other 8 are of type 'logic'. */
 	/* TODO. */