X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=cc9e3d7a67e570a4b64928fe455422493228800e;hb=98bfc4741f76b07e7db4c9628a6924004fc4fff4;hp=13831c05a9af4b7b90e4771a31e2587e5bd78d61;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git

diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 13831c05..cc9e3d7a 100644
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -72,12 +72,10 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *devices;
 
-	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;
@@ -92,29 +90,20 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup(center_devs[idx].vendor);
 	sdi->model = g_strdup(center_devs[idx].device);
-
-	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-		sr_err("Device context malloc failed.");
-		goto scan_cleanup;
-	}
-
+	devc = g_malloc0(sizeof(struct dev_context));
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
-
 	sdi->priv = devc;
 	sdi->driver = center_devs[idx].di;
 
 	for (i = 0; i <  center_devs[idx].num_channels; i++) {
-		if (!(ch = sr_channel_new(i, SR_CHANNEL_ANALOG,
-					   TRUE, channel_names[i])))
-			goto scan_cleanup;
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		sr_channel_new(sdi, i, SR_CHANNEL_ANALOG,
+				    TRUE, channel_names[i]);
 	}
 
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
 
-scan_cleanup:
 	serial_close(serial);
 
 	return devices;