X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=5969b1037fcdb4a149640b17ddab0694f12893a6;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=8f9dd5cbef7ad301bb27197ebd2604ef04ef35a6;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 8f9dd5cb..5969b103 100644
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -71,7 +71,7 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
 	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
 
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
 	drvc = mic_devs[idx].di->priv;
@@ -84,9 +84,10 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
 	sr_info("Found device on port %s.", conn);
 
 	/* TODO: Fill in version from protocol response. */
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, mic_devs[idx].vendor,
-				    mic_devs[idx].device, NULL)))
-		goto scan_cleanup;
+	sdi = sr_dev_inst_new();
+	sdi->status = SR_ST_INACTIVE;
+	sdi->vendor = g_strdup(mic_devs[idx].vendor);
+	sdi->model = g_strdup(mic_devs[idx].device);
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
 		sr_err("Device context malloc failed.");