X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=e590a4cc8aff6cb4fc4e7a1c014c7c2870e34705;hb=b1a7ca3b605a8a7e7ce97dfc9eb211e9b3a5c918;hp=74d477cb95f2505cb8056f2868d69463dca8ecff;hpb=50276118ca45dc3dbf91f2fc77fc1f611cf1e57d;p=libsigrok.git

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 74d477cb..e590a4cc 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -75,8 +75,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	int retry, len, i, s;
 	char buf[128], *b, **tokens;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
@@ -90,7 +89,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	while (!devices && retry < 3) {
 		retry++;
 		serial_flush(serial);
-		if (serial_write_blocking(serial, "ID\r", 3) < 0) {
+		if (serial_write_blocking(serial, "ID\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
 			sr_err("Unable to send ID string");
 			continue;
 		}
@@ -122,20 +121,18 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 					continue;
 				/* Skip leading spaces in version number. */
 				for (s = 0; tokens[1][s] == ' '; s++);
-				if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Fluke",
-						tokens[0] + 6, tokens[1] + s)))
-					return NULL;
-				if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-					sr_err("Device context malloc failed.");
-					return NULL;
-				}
+				sdi = g_malloc0(sizeof(struct sr_dev_inst));
+				sdi->status = SR_ST_INACTIVE;
+				sdi->vendor = g_strdup("Fluke");
+				sdi->model = g_strdup(tokens[0] + 6);
+				sdi->version = g_strdup(tokens[1] + s);
+				devc = g_malloc0(sizeof(struct dev_context));
 				devc->profile = &supported_flukedmm[i];
 				sdi->inst_type = SR_INST_SERIAL;
 				sdi->conn = serial;
 				sdi->priv = devc;
 				sdi->driver = di;
-				if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-					return NULL;
+				ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
 				sdi->channels = g_slist_append(sdi->channels, ch);
 				drvc->instances = g_slist_append(drvc->instances, sdi);
 				devices = g_slist_append(devices, sdi);
@@ -176,6 +173,7 @@ static GSList *scan(GSList *options)
 	if (!conn)
 		return NULL;
 
+	devices = NULL;
 	if (serialcomm) {
 		/* Use the provided comm specs. */
 		devices = fluke_scan(conn, serialcomm);
@@ -285,7 +283,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
 			fluke_receive_data, (void *)sdi);
 
-	if (serial_write_blocking(serial, "QM\r", 3) < 0) {
+	if (serial_write_blocking(serial, "QM\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
 		sr_err("Unable to send QM.");
 		return SR_ERR;
 	}